Merge pull request #2538 from Nick1200000/enhancement/docker-build

Add automated Docker build and publish workflow

.github/workflows/add-new-issues-to-project.yml

@@ -10,7 +10,7 @@ jobs:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.4.0
+      - uses: actions/add-to-project@v1.0.1
         with:
           project-url: https://github.com/orgs/GNS3/projects/3
           github-token: ${{ secrets.ADD_NEW_ISSUES_TO_PROJECT }}

.github/workflows/codeql-analysis.yml

@@ -13,58 +13,81 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master" ]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ "master" ]
   schedule:
-    - cron: '44 1 * * 3'
+    - cron: '21 12 * * 4'
 
 jobs:
   analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
       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
-
+        include:
+        - language: python
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
         # 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
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
 
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
     # ℹ️ 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
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/docker-build.yml

@@ -0,0 +1,39 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches: [ main, master, enhancement/**, dev ]
+  pull_request:
+    branches: [ main, master, enhancement/**, dev ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GH_TOKEN }}
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push to GitHub Container Registry
+      run: |
+        docker build -t ghcr.io/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):latest .
+        docker push ghcr.io/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):latest
+
+    - name: Build and push to Docker Hub
+      run: |
+        docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:latest .
+        docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:latest

.github/workflows/publish-api-documentation.yml

@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         ref: "gh-pages"
-    - uses: actions/setup-python@v3
+    - uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: Merge changes from 3.0 branch

.github/workflows/testing.yml

@@ -13,21 +13,35 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
+
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        os: ["ubuntu-latest"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        #include:
+          # only test with Python 3.10 on Windows
+        #  - os: windows-latest
+        #    python-version: "3.10"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       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
+        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

CHANGELOG

@@ -1,5 +1,105 @@
 # Change Log
 
+## 2.2.54 21/04/2025
+
+* Bundle web-ui v2.2.54
+* Add new method to find the IP address of a VBox GNS3 VM + allow NAT Network
+* Add edk2-stable202502 UEFI firmwares and try to first use firmwares from the ovmf package if installed. Fixes #2494
+* Try to detect swtpm and AppArmor issue. Ref https://github.com/GNS3/gns3-gui/issues/3725
+* Fix Docker logs decoding. Ref #2522
+* Add delay after starting a Docker container and adding connections in uBridge. Ref #2522
+* Fix TypeError when reading Docker container logs. Ref #2522
+* Replace "Docker hub" by "Docker repository" because it is possible to use different repositories
+* Upgrade dependencies
+* Improvements for remote-install.sh
+
+
+## 2.2.53 21/01/2025
+
+* Bundle web-ui v2.2.53
+* Add more information when patching .vbox file. Ref https://github.com/GNS3/gns3-gui/issues/3542
+* Increase timeout to run compute HTTP queries. Fixes #2461
+* Use 'allow_methods="*"' in aiohttp_cors.ResourceOptions(). Fixes #2459
+* Upgrade dependencies
+* Update remote-install.sh to support a custom repository and the deb822 source format
+* Fix: do not use the iourc file if IOU licence check is not enabled
+
+
+## 2.2.52 02/12/2024
+
+* Bundle web-ui v2.2.52
+* Remove restrictions based on file extension when listing images and fix ELF header checks
+* Fix use project name instead of ID for fast duplication when running local server. Fixes #2446
+* Overwrite user resources when the originals have changed.
+* Relax setuptools requirement to allow for easier Debian packaging on Ubuntu Focal & Jammy
+
+## 2.2.51 07/11/2024
+
+* Catch error when cannot resize Docker container TTY.
+* Do not use "ide" if there is a disk image and no interface type has been explicitly configured.
+* Use @locking when sending uBridge commands. Ref https://github.com/GNS3/gns3-gui/issues/3651
+* Fix run Docker containers with user namespaces enabled. Fixes #2414
+* Python 3.13 support
+* Upgrade dependencies
+* Fix errors in init.sh. Fixes #2431
+
+## 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
+* Forbid -nic and -nicdev in Qemu additional options. Fixes https://github.com/GNS3/gns3-server/issues/2397
+* Upgrade jsonschema and sentry-sdk packages
+* Update IOU base configs to use "no ip domain lookup". Fixes #2404
+
+## 2.2.48.1 12/07/2024
+
+* Bundle web-ui v2.2.48.1
+
+## 2.2.48 08/07/2024
+
+* Bundle web-ui v2.2.48
+* Add 'install_builtin_appliances' and 'resources_path' settings in the server config
+* Option to keep the compute IDs unchanged when exporting a project
+* Forbid unsafe Qemu additional options
+* Fix error when snapshot exists with an underscore in the name
+* Upgrade sentry-sdk, psutil and aiofiles packages
+* Fix check for IPv6 enabled on host
+
+## 2.2.47 15/05/2024
+
+* Fix update-bundled-web-ui.sh script
+* Bundle web-ui v2.2.47
+* Change sentry-sdk version
+* Upgrade aiohttp, sentry-sdk and truststore
+* Upgrade jsonschema and aiohttp
+* Drop Python 3.7
+* Remove dev requirements for Python 3.6
+* Do not run Docker VM tests on Windows
+* Do not wait for the server to close when shutting down.
+* Fix test create image with not supported characters by filesystem. Fixes #2375
+* Allow listing x86_64 IOU images. Fixes #2376
+* Upgrade Jinja2 to version 3.1.4. Fixes #2378
+* Fix link capture for ATM switch. Fixes https://github.com/GNS3/gns3-gui/issues/3570
+* Fix tests after updating error message when busybox is not installed.
+* Add more details to error message when busybox is not installed. Fixes https://github.com/GNS3/gns3-gui/issues/3569
+* Fix invalid escape sequences
+* Add NAT symbols
+* Fix cannot stop Docker VM while console connection is still active.
+* Upgrade sentry-sdk to version 1.40.6
+
 ## 2.2.46 26/02/2024
 
 * Bundle web-ui v2.2.46

Dockerfile

@@ -1,24 +1,27 @@
 # Dockerfile for GNS3 server development
 
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Set the locale
-ENV LANG en_US.UTF-8  
-ENV LANGUAGE en_US:en  
-ENV LC_ALL en_US.UTF-8 
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
+
+# this environment is externally managed
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
 
 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 \ 
+    python3-dev \
     qemu-system-x86 \
     qemu-kvm \
-    libvirt-bin \
-    x11vnc 
+    libvirt-daemon-system libvirt-clients \
+    x11vnc
 
 RUN locale-gen en_US.UTF-8
 
@@ -32,4 +35,4 @@ RUN pip3 install --no-cache-dir -r /server/requirements.txt
 
 EXPOSE 3080
 
-CMD python3 -m gns3server
+CMD [ "python3", "-m", "gns3server", "--port", "3080" ]

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:
@@ -112,6 +112,12 @@ For development, you can run the GNS3 server in a container
 bash scripts/docker_dev_server.sh
 ```
 
+#### use Docker Compose
+
+``` {.bash}
+docker compose up -d
+```
+
 ### Run as daemon (Unix only)
 
 You will find init sample scripts for various systems inside the init

appveyor.yml

@@ -1,22 +0,0 @@
-version: '{build}-{branch}'
-
-image: Visual Studio 2022
-
-platform: x64
-
-environment:
-    PYTHON: "C:\\Python38-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"
-
-build: off
-
-test_script:
-    - "%PYTHON%\\python.exe -m pytest -v"

compose.yaml

@@ -0,0 +1,7 @@
+services:
+  gen3-server:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8001:3080"

conf/gns3_server.conf

@@ -9,18 +9,23 @@ ssl = False
 certfile=/home/gns3/.config/GNS3/ssl/server.cert
 certkey=/home/gns3/.config/GNS3/ssl/server.key
 
-; Path where devices images are stored
+; Path where binary images are stored
 images_path = /home/gns3/GNS3/images
 
 ; Path where user projects are stored
 projects_path = /home/gns3/GNS3/projects
 
-; Path where user appliances are stored
+; Path where custom user appliances are stored
 appliances_path = /home/gns3/GNS3/appliances
 
-; Path where custom device symbols are stored
+; Path where custom user symbols are stored
 symbols_path = /home/gns3/GNS3/symbols
 
+; Path where files like built-in appliances and Docker resources are stored
+; The default path is the local user data directory
+; (Linux: "~/.local/share/GNS3", macOS: "~/Library/Application Support/GNS3", Windows: "%APPDATA%\GNS3")
+; resources_path = /home/gns3/GNS3/resources
+
 ; Option to automatically send crash reports to the GNS3 team
 report_errors = True
 
@@ -62,6 +67,9 @@ default_nat_interface = vmnet10
 ; Enable the built-in templates
 enable_builtin_templates = True
 
+; Install built-in appliances
+install_builtin_appliances = True
+
 ; check if hardware virtualization is used by other emulators (KVM, VMware or VirtualBox)
 hardware_virtualization_check = True
 
@@ -93,6 +101,8 @@ require_kvm = True
 enable_hardware_acceleration = True
 ; Require hardware acceleration in order to start VMs (all platforms)
 require_hardware_acceleration = False
+; Allow unsafe additional command line options
+allow_unsafe_options = False
 
 [VMware]
 ; First vmnet interface of the range that can be managed by the GNS3 server

dev-requirements.txt

@@ -1,8 +1,6 @@
 -rrequirements.txt
 
-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
+pytest==8.3.3
+flake8==7.1.0
+pytest-timeout==2.3.1
+pytest-aiohttp==1.0.5

gns3server/appliances/almalinux.gns3a

@@ -25,29 +25,45 @@
         "options": "-cpu host -nographic"
     },
     "images": [
+        {
+            "filename": "AlmaLinux-9-GenericCloud-9.4-20240805.x86_64.qcow2",
+            "version": "9.4",
+            "md5sum": "7c5040c044a989c524d40824cebb4a4d",
+            "filesize": 591724544,
+            "download_url": "https://vault.almalinux.org/9.4/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/9.4/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.4-20240805.x86_64.qcow2"
+        },
         {
             "filename": "AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2",
             "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.9-20231128.x86_64.qcow2",
+            "version": "8.9",
+            "md5sum": "1afc48c798960f0c6ebb65428c0ea973",
+            "filesize": 697434112,
+            "download_url": "https://vault.almalinux.org/8.9/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/8.9/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.9-20231128.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",
@@ -59,6 +75,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.4",
+            "images": {
+                "hda_disk_image": "AlmaLinux-9-GenericCloud-9.4-20240805.x86_64.qcow2",
+                "cdrom_image": "almalinux-cloud-init-data.iso"
+            }
+        },
         {
             "name": "9.2",
             "images": {
@@ -66,6 +89,13 @@
                 "cdrom_image": "almalinux-cloud-init-data.iso"
             }
         },
+        {
+            "name": "8.9",
+            "images": {
+                "hda_disk_image": "AlmaLinux-8-GenericCloud-8.9-20231128.x86_64.qcow2",
+                "cdrom_image": "almalinux-cloud-init-data.iso"
+            }
+        },
         {
             "name": "8.8",
             "images": {

gns3server/appliances/alpine-cloud.gns3a

@@ -0,0 +1,56 @@
+{
+    "appliance_id": "edbaa01e-2032-4ee2-bb9f-dd5c4d84c270",
+    "name": "Alpine Cloud Guest",
+    "category": "guest",
+    "description": "Alpine Linux is a security-oriented, lightweight Linux distribution based on musl libc and busybox.",
+    "vendor_name": "Alpine Linux Development Team",
+    "vendor_url": "http://alpinelinux.org",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Alpine Linux.png",
+    "documentation_url": "http://wiki.alpinelinux.org",
+    "product_name": "Alpine Linux",
+    "product_url": "https://www.alpinelinux.org/cloud/",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "\nUsername: alpine\nPassword: alpine",
+    "port_name_format": "Ethernet{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 1,
+        "ram": 1024,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "require",
+        "options": "-nographic"
+    },
+    "images": [
+        {
+            "filename": "generic_alpine-3.21.2-x86_64-bios-cloudinit-r0.qcow2",
+            "version": "3.21.2",
+            "md5sum": "b40825dff2867e0ffaffbc4c87674462",
+            "filesize": 189726720,
+            "download_url": "https://www.alpinelinux.org/cloud/",
+            "direct_download_url": "https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/cloud/generic_alpine-3.21.2-x86_64-bios-cloudinit-r0.qcow2"
+        },
+        {
+            "filename": "alpine-cloud-init-data.iso",
+            "version": "1.0",
+            "md5sum": "b1b4b16cc3bf0250c0fa377c19c97683",
+            "filesize": 374784,
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/alpine-cloud",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/alpine-cloud/alpine-cloud-init-data.iso"
+        }
+    ],
+    "versions": [
+        {
+            "name": "3.21.2",
+            "images": {
+                "hda_disk_image": "generic_alpine-3.21.2-x86_64-bios-cloudinit-r0.qcow2",
+                "cdrom_image": "alpine-cloud-init-data.iso"
+            }
+        }
+    ]
+}

gns3server/appliances/arista-veos.gns3a

@@ -2,14 +2,14 @@
     "appliance_id": "c90f3ff3-4ed2-4437-9afb-21232fa92015",
     "name": "Arista vEOS",
     "category": "multilayer_switch",
-    "description": "Arista EOS\u00ae is the core of Arista cloud networking solutions for next-generation data centers and cloud networks. Cloud architectures built with Arista EOS scale to tens of thousands of compute and storage nodes with management and provisioning capabilities that work at scale. Through its programmability, EOS enables a set of software applications that deliver workflow automation, high availability, unprecedented network visibility and analytics and rapid integration with a wide range of third-party applications for virtualization, management, automation and orchestration services.\n\nArista Extensible Operating System (EOS) is a fully programmable and highly modular, Linux-based network operation system, using familiar industry standard CLI and runs a single binary software image across the Arista switching family. Architected for resiliency and programmability, EOS has a unique multi-process state sharing architecture that separates state information and packet forwarding from protocol processing and application logic.",
+    "description": "Arista EOS is the core of Arista cloud networking solutions for next-generation data centers and cloud networks. Cloud architectures built with Arista EOS scale to tens of thousands of compute and storage nodes with management and provisioning capabilities that work at scale. Through its programmability, EOS enables a set of software applications that deliver workflow automation, high availability, unprecedented network visibility and analytics and rapid integration with a wide range of third-party applications for virtualization, management, automation and orchestration services.\n\nArista Extensible Operating System (EOS) is a fully programmable and highly modular, Linux-based network operation system, using familiar industry standard CLI and runs a single binary software image across the Arista switching family. Architected for resiliency and programmability, EOS has a unique multi-process state sharing architecture that separates state information and packet forwarding from protocol processing and application logic.",
     "vendor_name": "Arista",
     "vendor_url": "http://www.arista.com/",
     "documentation_url": "https://www.arista.com/assets/data/docs/Manuals/EOS-4.17.2F-Manual.pdf",
     "product_name": "vEOS",
     "product_url": "https://eos.arista.com/",
     "registry_version": 4,
-    "status": "experimental",
+    "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "The login is admin, with no password by default",
@@ -24,378 +24,60 @@
         "hdb_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
-        "kvm": "require"
+        "kvm": "require",
+        "options": "-cpu host"
     },
     "images": [
         {
-            "filename": "vEOS-lab-4.26.2F.vmdk",
-            "version": "4.26.2F",
-            "md5sum": "de8ce9750fddb63bd3f71bccfcd7651e",
-            "filesize": 475332608,
+            "filename": "vEOS64-lab-4.33.2F.qcow2",
+            "version": "4.33.2F",
+            "md5sum": "fbe629a8342cd0b3b19566b9d7ef4f4f",
+            "filesize": 610992128,
             "download_url": "https://www.arista.com/en/support/software-download"
         },
         {
-            "filename": "vEOS-lab-4.25.3M.vmdk",
-            "version": "4.25.3M",
-            "md5sum": "2f196969036b4d283e86f15118d59c26",
-            "filesize": 451543040,
+            "filename": "vEOS64-lab-4.32.4.1M.qcow2",
+            "version": "4.32.4.1M",
+            "md5sum": "cd369b5ccfd87ccd83a34538681ba35f",
+            "filesize": 605159424,
             "download_url": "https://www.arista.com/en/support/software-download"
         },
         {
-            "filename": "vEOS-lab-4.24.3M.vmdk",
-            "version": "4.24.3M",
-            "md5sum": "0a28e44c7ce4a8965f24a4a463a89b7d",
-            "filesize": 455213056,
+            "filename": "vEOS64-lab-4.31.6M.qcow2",
+            "version": "4.31.6M",
+            "md5sum": "02fbd929de9416e1096cd2454507d6ce",
+            "filesize": 590479360,
             "download_url": "https://www.arista.com/en/support/software-download"
         },
         {
-            "filename": "vEOS-lab-4.24.2.1F.vmdk",
-            "version": "4.24.2.1F",
-            "md5sum": "6bab8b59ce5230e243e56f4127448fc8",
-            "filesize": 455213056,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.23.4.2M.vmdk",
-            "version": "4.23.4.2M",
-            "md5sum": "d21cbef4e39f1e783b13a926cb54a242",
-            "filesize": 454295552,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.23.0.1F.vmdk",
-            "version": "4.23.0.1F",
-            "md5sum": "08d52154aa11a834aef9f42bbf29f977",
-            "filesize": 439484416,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.22.2.1F.vmdk",
-            "version": "4.22.2.1F",
-            "md5sum": "2a425bf8efe569a2bdf0e328f240cd16",
-            "filesize": 426377216,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.22.0F.vmdk",
-            "version": "4.22.0F",
-            "md5sum": "cfcc75c2b8176cfd819afcfd6799b74c",
-            "filesize": 414121984,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.21.1.1F.vmdk",
-            "version": "4.21.1F",
-            "md5sum": "02bfb7e53781fd44ff02357f201586d9",
-            "filesize": 358809600,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.20.10M-combined.vmdk",
-            "version": "4.20.10M-combined",
-            "md5sum": "d1f2d650f93dbf24e04fdd2c9d62bd62",
-            "filesize": 334626816,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.20.1F.vmdk",
-            "version": "4.20.1F",
-            "md5sum": "aadb6f3dbff28317f68cb4c4502d0db8",
-            "filesize": 662044672,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.19.10M-combined.vmdk",
-            "version": "4.19.10M-combined",
-            "md5sum": "103daa45c33be4584cbe6adc60de46a3",
-            "filesize": 324141056,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.19.10M.vmdk",
-            "version": "4.19.10M",
-            "md5sum": "665ed14389411ae5f16ba0a2ff84240a",
-            "filesize": 637337600,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.18.10M-combined.vmdk",
-            "version": "4.18.10M-combined",
-            "md5sum": "e33e0ef5b8cecc84c5bb57569b36b9c6",
-            "filesize": 317652992,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.18.10M.vmdk",
-            "version": "4.18.10M",
-            "md5sum": "1d87e9ace37fe3706dbf3e49c8d4d231",
-            "filesize": 624427008,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.18.5M.vmdk",
-            "version": "4.18.5M",
-            "md5sum": "b1ee6268dbaf2b2276fd7a5286c7ce2b",
-            "filesize": 623116288,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.18.1F.vmdk",
-            "version": "4.18.1F",
-            "md5sum": "9648c63185f3b793b47528a858ca4364",
-            "filesize": 620625920,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.17.8M.vmdk",
-            "version": "4.17.8M",
-            "md5sum": "afc79a06f930ea2cc0ae3e03cbfd3f23",
-            "filesize": 608829440,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.17.2F.vmdk",
-            "version": "4.17.2F",
-            "md5sum": "3b4845edfa77cf9aaeb9c0a005d3e277",
-            "filesize": 609615872,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.16.13M.vmdk",
-            "version": "4.16.13M",
-            "md5sum": "4d0facf90140fc3aab031f0f8f88a32f",
-            "filesize": 521404416,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.16.6M.vmdk",
-            "version": "4.16.6M",
-            "md5sum": "b3f7b7cee17f2e66bb38b453a4939fef",
-            "filesize": 519962624,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.15.10M.vmdk",
-            "version": "4.15.10M",
-            "md5sum": "98e08281a9c48ddf6f3c5d62a124a20f",
-            "filesize": 517079040,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.15.5M.vmdk",
-            "version": "4.15.5M",
-            "md5sum": "cd74bb69c7ee905ac3d33c4d109f3ab7",
-            "filesize": 516030464,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.14.14M.vmdk",
-            "version": "4.14.14M",
-            "md5sum": "d81ba0522f4d7838d96f7985e41cdc47",
-            "filesize": 422641664,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.13.16M.vmdk",
-            "version": "4.13.16M",
-            "md5sum": "5763b2c043830c341c8b1009f4ea9a49",
-            "filesize": 404684800,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.13.8M.vmdk",
-            "version": "4.13.8M",
-            "md5sum": "a47145b9e6e7a24171c0850f8755535e",
-            "filesize": 409010176,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "Aboot-veos-serial-8.0.0.iso",
-            "version": "8.0.0",
-            "md5sum": "488ad1c435d18c69bb8d69c7806457c9",
-            "filesize": 5242880,
+            "filename": "Aboot-veos-serial-8.0.2.iso",
+            "version": "8.0.2",
+            "md5sum": "8d7e754efebca1930a93a2587ff7606c",
+            "filesize": 6291456,
             "download_url": "https://www.arista.com/en/support/software-download"
         }
     ],
     "versions": [
         {
-            "name": "4.26.2F",
+            "name": "4.33.2F",
             "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.26.2F.vmdk"
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS64-lab-4.33.2F.qcow2"
             }
         },
         {
-            "name": "4.25.3M",
+            "name": "4.32.4.1M",
             "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.25.3M.vmdk"
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS64-lab-4.32.4.1M.qcow2"
             }
         },
         {
-            "name": "4.24.3M",
+            "name": "4.31.6M",
             "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.24.3M.vmdk"
-            }
-        },
-        {
-            "name": "4.24.2.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.24.2.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.23.4.2M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.23.4.2M.vmdk"
-            }
-        },
-        {
-            "name": "4.23.0.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.23.0.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.22.2.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.22.2.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.22.0F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.22.0F.vmdk"
-            }
-        },
-        {
-            "name": "4.21.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.21.1.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.20.10M-combined",
-            "images": {
-                "hda_disk_image": "vEOS-lab-4.20.10M-combined.vmdk"
-            }
-        },
-        {
-            "name": "4.20.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.20.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.19.10M-combined",
-            "images": {
-                "hda_disk_image": "vEOS-lab-4.19.10M-combined.vmdk"
-            }
-        },
-        {
-            "name": "4.19.10M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.19.10M.vmdk"
-            }
-        },
-        {
-            "name": "4.18.10M-combined",
-            "images": {
-                "hda_disk_image": "vEOS-lab-4.18.10M-combined.vmdk"
-            }
-        },
-        {
-            "name": "4.18.10M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.18.10M.vmdk"
-            }
-        },
-        {
-            "name": "4.18.5M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.18.5M.vmdk"
-            }
-        },
-        {
-            "name": "4.18.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.18.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.17.8M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.17.8M.vmdk"
-            }
-        },
-        {
-            "name": "4.17.2F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.17.2F.vmdk"
-            }
-        },
-        {
-            "name": "4.16.13M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.16.13M.vmdk"
-            }
-        },
-        {
-            "name": "4.16.6M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.16.6M.vmdk"
-            }
-        },
-        {
-            "name": "4.15.10M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.15.10M.vmdk"
-            }
-        },
-        {
-            "name": "4.15.5M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.15.5M.vmdk"
-            }
-        },
-        {
-            "name": "4.14.14M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.14.14M.vmdk"
-            }
-        },
-        {
-            "name": "4.13.16M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.13.16M.vmdk"
-            }
-        },
-        {
-            "name": "4.13.8M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.13.8M.vmdk"
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS64-lab-4.31.6M.qcow2"
             }
         }
     ]
-}
+}

gns3server/appliances/aruba-arubaoscx.gns3a

@@ -32,6 +32,48 @@
         "process_priority": "normal"
     },
     "images": [
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20241115202521.vmdk",
+            "version": "10.15.0005",
+            "md5sum": "69b3675391c04c1a6e0fd0bf8d8bc2d9",
+            "filesize": 420049408,
+            "download_url": "https://networkingsupport.hpe.com"
+        },
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20240731173624.vmdk",
+            "version": "10.14.1000",
+            "md5sum": "01d6932fbc9c46180a4f41aee9e98301",
+            "filesize": 412140544,
+            "download_url": "https://networkingsupport.hpe.com"
+        },
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20240528190307.vmdk",
+            "version": "10.14.0001",
+            "md5sum": "83902dbaa74c37cdda3f066f79431933",
+            "filesize": 401023488,
+            "download_url": "https://networkingsupport.hpe.com"
+        },
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20240129204649.vmdk",
+            "version": "10.13.1000",
+            "md5sum": "a1a24b15e3b8a09b0c0f14bdfacc4a75",
+            "filesize": 395342848,
+            "download_url": "https://networkingsupport.hpe.com"
+        },
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20231110145644.vmdk",
+            "version": "10.13.0005",
+            "md5sum": "427fd4580e2ee3eac55a9e7d629d1375",
+            "filesize": 394995200,
+            "download_url": "https://networkingsupport.hpe.com"
+        },
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20230810165021.vmdk",
+            "version": "10.12.1000",
+            "md5sum": "ea89f94dda9d28bf583dc35e0299b106",
+            "filesize": 384622080,
+            "download_url": "https://networkingsupport.hpe.com"
+        },
         {
             "filename": "arubaoscx-disk-image-genericx86-p4-20230531220439.vmdk",
             "version": "10.12.0006",
@@ -118,6 +160,42 @@
         }
     ],
     "versions": [
+        {
+            "name": "10.15.0005",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20241115202521.vmdk"
+            }
+        },
+        {
+            "name": "10.14.1000",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20240731173624.vmdk"
+            }
+        },
+        {
+            "name": "10.14.0001",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20240528190307.vmdk"
+            }
+        },
+        {
+            "name": "10.13.1000",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20240129204649.vmdk"
+            }
+        },
+        {
+            "name": "10.13.0005",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20231110145644.vmdk"
+            }
+        },
+        {
+            "name": "10.12.1000",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20230810165021.vmdk"
+            }
+        },
         {
             "name": "10.12.0006",
             "images": {

gns3server/appliances/asterfusion-vAsterNOS-campus.gns3a

@@ -0,0 +1,63 @@
+{
+    "appliance_id": "9e934470-d898-4289-a5ed-50af094e629e",
+    "name": "Asterfusion vAsterNOS campus", 
+    "category": "multilayer_switch",
+    "description": "AsterNOS is the core technology of Asterfusion’s one-stop SONiC turnkey solution designed for cloud, enterprise, and AI-driven scenarios. AsterNOS v5.2 Campus is specifically designed for traditional campus networks, offering comprehensive L2/L3 capabilities suitable for various campus scenarios such as schools, office buildings, and hospitals. This version supports a fully cloud-integrated Layer 3 network architecture, providing rich routing and switching functionalities to ensure high-performance operation and ease of maintenance. It can also be deployed in the GNS3 simulation environment to experience a complete All-Layer 3 Cloud-Campus network. AsterNOS v6.0 Campus builds upon the L2/L3 features of v5.2 (including ACL, MSTP, QinQ, IGMP Snooping, OSPF/BGP, etc.) and further enhances support for advanced technologies such as MPLS L2VPN/L3VPN and PTP. This version is ideal for enterprises and campus networks requiring high-performance multi-service transport, supporting cross-domain connectivity and providing nanosecond-level time synchronization. It is well-suited for applications with stringent time accuracy requirements, such as financial trading, industrial automation, and smart manufacturing. NOTICE: This appliance file is a virtualized version of AsterNOS and is intended to be used only to experience the basic functionality and industry standard CLI (Klish), not for official software testing. For more information about AsterNOS commercial version, please feel free to contact us via Email: bd@cloudswit.ch",
+    "vendor_name": "Asterfusion",
+    "vendor_url": "https://cloudswit.ch/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/asterfusion.png", 
+    "documentation_url": "https://help.cloudswit.ch/portal/en/kb/articles/vasternos", 
+    "product_name": "vAsterNOS",
+    "product_url": "https://cloudswit.ch/",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "Asterfusion",
+    "maintainer_email": "bd@cloudswit.ch",
+    "usage": "The login is admin and the password is asteros",
+    "symbol": "asterfusion-vAsterNOS.svg",
+    "first_port_name": "eth0",
+    "port_name_format": "Ethernet{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 10,
+        "ram": 4096,
+        "cpus": 4,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "d",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "vAsterNOS-V6.1R002.img",
+            "version": "6.1-2",
+            "md5sum": "003e6329489a617fbab5783504559d26",
+            "filesize": 2106851328,
+            "download_url": "https://drive.cloudswitch.io/external/c224501f36e6003767b30112bd44d92476f81f442cf47f8027a6f4f7e4227995"
+        },
+        {
+            "filename": "vAsterNOS-V5.2R012P01.img",
+            "version": "5.2-12-1",
+            "md5sum": "d18c0cfd786607ccc6dc1069a8f40465",
+            "filesize": 2823290880,
+            "download_url": "https://drive.cloudswitch.io/external/d29f6d0a6c8322fea42b3c08e95113d026b8ec6aafbe29193c338333077f3da7"
+        }
+
+    ],
+    "versions": [
+        {
+            "name": "6.1-2",
+            "images": {
+                "hda_disk_image": "vAsterNOS-V6.1R002.img"
+            }
+        },
+        {
+            "name": "5.2-12-1",
+            "images": {
+                "hda_disk_image": "vAsterNOS-V5.2R012P01.img"
+            }
+        }
+    ]
+}
+

gns3server/appliances/asterfusion-vAsterNOS.gns3a

@@ -0,0 +1,49 @@
+{
+    "appliance_id": "e8001e2b-8ef3-44eb-ace5-79f68f3773e8",
+    "name": "Asterfusion vAsterNOS",
+    "category": "multilayer_switch",
+    "description": "AsterNOS is the core technology of Asterfusion's one-stop turnkey SONiC solution for cloud, enterprise and AI. As an enterprise ready SONiC distribution, AsterNOS features rich functionality enhancement such as MC-LAG, VXLAN, BGP EVPN-Multihoming, RoCEv2(Easy RoCE), and more, making it powerful and easy-to-use in a variety of production scenarios. Currently, AsterNOS is compatible with top commercial  switching chips (e.g. Marvell Teralynx, Prestera Falcon/Aldrin/Alleycat, Broadcom Tomahawk/Trident, Intel Tofino and some of NVIDIA's chips.)Through AsterNOS's rich L2/L3 features and enhancements in virtualization and management, cloud architecture built with Asterfusion switching families from 1G-800G (or other standard whitebox switches) can scale to tens of thousands of compute and storage nodes, working smoothly both in underlay nework and overlay cloud fabric with OpenStack integrated, supporting ultra low latency lossless RoCE network in AIGC, distributed storage , or building easily managed access clusters for campus networks.NOTICE: This appliance file is a virtualized version of AsterNOS and is intended to be used only to experience the basic functionality and industry standard CLI (Klish), not for official software testing. For more information about AsterNOS commercial version, please feel free to contact us via Email: bd@cloudswit.ch",
+    "vendor_name": "Asterfusion",
+    "vendor_url": "https://cloudswit.ch/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/asterfusion.png",
+    "documentation_url": "https://help.cloudswit.ch/portal/en/kb/articles/vasternos",
+    "product_name": "vAsterNOS",
+    "product_url": "https://cloudswit.ch/product/sonic-enterprise-distribution",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "Asterfusion",
+    "maintainer_email": "bd@cloudswit.ch",
+    "usage": "The login is admin and the password is asteros",
+    "symbol": "asterfusion-vAsterNOS.svg",
+    "first_port_name": "eth0",
+    "port_name_format": "Ethernet{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 10,
+        "ram": 4096,
+        "cpus": 2,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "d",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "vAsterNOS-V3.1.img",
+            "version": "V3.1",
+            "md5sum": "c323c9c3f60e1a93eca2acdc5034b85c",
+            "filesize": 2724659200,
+            "download_url": "https://drive.cloudswitch.io/external/8ae2e3932ad8bb2ec30dd25be415d288ff3e4a949c557c6bd48ac6e6265bcfc1"
+        }
+    ],
+    "versions": [
+        {
+            "name": "V3.1",
+            "images": {
+                "hda_disk_image": "vAsterNOS-V3.1.img"
+            }
+        }
+    ]
+}
+

gns3server/appliances/centos-cloud.gns3a

@@ -27,44 +27,28 @@
     },
     "images": [
         {
-            "filename": "CentOS-Stream-GenericCloud-9-20230704.1.x86_64.qcow2",
-            "version": "Stream-9 (20230704.1)",
-            "md5sum": "e04511e019325a97837edd9eafe02b48",
-            "filesize": 1087868416,
+            "filename": "CentOS-Stream-GenericCloud-x86_64-10-20250331.0.x86_64.qcow2",
+            "version": "Stream-10 (20250331.0)",
+            "md5sum": "776033371ca346001dd6390f0cbaf0d0",
+            "filesize": 952041472,
+            "download_url": "https://cloud.centos.org/centos/10-stream/x86_64/images",
+            "direct_download_url": "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-20250331.0.x86_64.qcow2"
+        },
+        {
+            "filename": "CentOS-Stream-GenericCloud-9-20250331.0.x86_64.qcow2",
+            "version": "Stream-9 (20250331.0)",
+            "md5sum": "4aaeddc6ca497065522c75a7471f9bfd",
+            "filesize": 1250625536,
             "download_url": "https://cloud.centos.org/centos/9-stream/x86_64/images",
-            "direct_download_url": "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20230704.1.x86_64.qcow2"
+            "direct_download_url": "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20250331.0.x86_64.qcow2"
         },
         {
-            "filename": "CentOS-Stream-GenericCloud-8-20230710.0.x86_64.qcow2",
-            "version": "Stream-8 (20230710.0)",
-            "md5sum": "83e02ce98c29753c86fb7be7d802aa75",
-            "filesize": 1676164096,
+            "filename": "CentOS-Stream-GenericCloud-8-20240603.0.x86_64.qcow2",
+            "version": "Stream-8 (20240603.0)",
+            "md5sum": "77f3c9650785b8e977209796e09ee33e",
+            "filesize": 2003698688,
             "download_url": "https://cloud.centos.org/centos/8-stream/x86_64/images",
-            "direct_download_url": "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20230710.0.x86_64.qcow2"
-        },
-        {
-            "filename": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2",
-            "version": "8.4 (2105)",
-            "md5sum": "032eed270415526546eac07628905a62",
-            "filesize": 1309652992,
-            "download_url": "https://cloud.centos.org/centos/8/x86_64/images",
-            "direct_download_url": "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2"
-        },
-        {
-            "filename": "CentOS-7-x86_64-GenericCloud-2111.qcow2",
-            "version": "7 (2111)",
-            "md5sum": "730b8662695831670721c8245be61dac",
-            "filesize": 897384448,
-            "download_url": "https://cloud.centos.org/centos/7/images",
-            "direct_download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2111.qcow2"
-        },
-        {
-            "filename": "CentOS-7-x86_64-GenericCloud-1809.qcow2",
-            "version": "7 (1809)",
-            "md5sum": "da79108d1324b27bd1759362b82fbe40",
-            "filesize": 914948096,
-            "download_url": "https://cloud.centos.org/centos/7/images",
-            "direct_download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2"
+            "direct_download_url": "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20240603.0.x86_64.qcow2"
         },
         {
             "filename": "centos-cloud-init-data.iso",
@@ -77,37 +61,23 @@
     ],
     "versions": [
         {
-            "name": "Stream-9 (20230704.1)",
+            "name": "Stream-10 (20250331.0)",
             "images": {
-                "hda_disk_image": "CentOS-Stream-GenericCloud-9-20230704.1.x86_64.qcow2",
+                "hda_disk_image": "CentOS-Stream-GenericCloud-x86_64-10-20250331.0.x86_64.qcow2",
                 "cdrom_image": "centos-cloud-init-data.iso"
             }
         },
         {
-            "name": "Stream-8 (20230710.0)",
+            "name": "Stream-9 (20250331.0)",
             "images": {
-                "hda_disk_image": "CentOS-Stream-GenericCloud-8-20230710.0.x86_64.qcow2",
+                "hda_disk_image": "CentOS-Stream-GenericCloud-9-20250331.0.x86_64.qcow2",
                 "cdrom_image": "centos-cloud-init-data.iso"
             }
         },
         {
-            "name": "8.4 (2105)",
+            "name": "Stream-8 (20240603.0)",
             "images": {
-                "hda_disk_image": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2",
-                "cdrom_image": "centos-cloud-init-data.iso"
-            }
-        },
-        {
-            "name": "7 (2111)",
-            "images": {
-                "hda_disk_image": "CentOS-7-x86_64-GenericCloud-2111.qcow2",
-                "cdrom_image": "centos-cloud-init-data.iso"
-            }
-        },
-        {
-            "name": "7 (1809)",
-            "images": {
-                "hda_disk_image": "CentOS-7-x86_64-GenericCloud-1809.qcow2",
+                "hda_disk_image": "CentOS-Stream-GenericCloud-8-20240603.0.x86_64.qcow2",
                 "cdrom_image": "centos-cloud-init-data.iso"
             }
         }

gns3server/appliances/cisco-7200.gns3a

@@ -33,11 +33,23 @@
             "md5sum": "cbbbea66a253f1dac0fcf81274dc778d",
             "filesize": 87756936
         },
+        {
+            "filename": "c7200-adventerprisek9-mz.152-4.M11.image",
+            "version": "152-4.M11",
+            "md5sum": "9a2005ad09ce1ec6fe7cf9af1e9b099e",
+            "filesize": 128487680
+        },
         {
             "filename": "c7200-adventerprisek9-mz.124-24.T5.image",
             "version": "124-24.T5",
             "md5sum": "6b89d0d804e1f2bb5b8bda66b5692047",
             "filesize": 102345240
+        },
+        {
+            "filename": "c7200-a3jk9s-mz.124-25g.image",
+            "version": "124-25G",
+            "md5sum": "9c7cc9b3f3b3571411a7f62faaa2c036",
+            "filesize": 71528984
         }
     ],
     "versions": [
@@ -55,12 +67,26 @@
                 "image": "c7200-advipservicesk9-mz.152-4.S5.image"
             }
         },
+        {
+            "name": "152-4.M11",
+            "idlepc": "0x6062e5c0",
+            "images": {
+                "image": "c7200-adventerprisek9-mz.152-4.M11.image"
+            }
+        },
         {
             "name": "124-24.T5",
             "idlepc": "0x606df838",
             "images": {
                 "image": "c7200-adventerprisek9-mz.124-24.T5.image"
             }
+        },
+        {
+            "name": "124-25G",
+            "idlepc": "0x6066a998",
+            "images": {
+                "image": "c7200-a3jk9s-mz.124-25g.image"
+            }
         }
     ]
 }

gns3server/appliances/cisco-asav.gns3a

@@ -5,14 +5,14 @@
     "description": "The Adaptive Security Virtual Appliance is a virtualized network security solution based on the market-leading Cisco ASA 5500-X Series firewalls. It supports both traditional and next-generation software-defined network (SDN) and Cisco Application Centric Infrastructure (ACI) environments to provide policy enforcement and threat inspection across heterogeneous multisite environments.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
-    "documentation_url": "http://www.cisco.com/c/en/us/support/security/virtual-adaptive-security-appliance-firewall/products-installation-guides-list.html",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/asav/",
     "product_name": "ASAv",
-    "product_url": "http://www.cisco.com/c/en/us/products/security/virtual-adaptive-security-appliance-firewall/index.html",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "There is no default password and enable password. A default configuration is present. ASAv goes through a double-boot before becoming active. This is normal and expected.",
+    "usage": "There is no default password and enable password. A default configuration is present. ASAv goes through a double-boot before becoming active. This is normal and expected. Switch to the Telnet console type after the first boot.",
     "symbol": ":/symbols/asa.svg",
     "first_port_name": "Management0/0",
     "port_name_format": "Gi0/{0}",
@@ -26,6 +26,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "asav9-22-1-1.qcow2",
+            "version": "9.22.1.1 CML",
+            "md5sum": "250a924cdc2370208eaac9d1dc8dc9e3",
+            "filesize": 379518976,
+            "download_url": "https://learningnetworkstore.cisco.com/cisco-modeling-labs-personal/cisco-modeling-labs-personal/CML-PERSONAL.html"
+        },
         {
             "filename": "asav9-18-2.qcow2",
             "version": "9.18.2 CML",
@@ -126,6 +133,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.22.1.1 CML",
+            "images": {
+                "hda_disk_image": "asav9-22-1-1.qcow2"
+            }
+        },
         {
             "name": "9.18.2 CML",
             "images": {

gns3server/appliances/cisco-c8000v.gns3a

@@ -5,9 +5,9 @@
     "description": "The Cisco Catalyst 8000V Edge Software is a virtual, form-factor router deployed on a virtual machine (VM) running on an x86 server hardware.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
-    "documentation_url": "https://www.cisco.com/c/en/us/td/docs/routers/C8000V/Configuration/c8000v-installation-configuration-guide.html",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/cat-8000v/",
     "product_name": "c8000v",
-    "product_url": "https://www.cisco.com/c/en/us/support/routers/catalyst-8000v-edge-software/series.html",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
@@ -25,11 +25,25 @@
     },
     "images": [
         {
+            "filename": "c8000v-universalk9_8G_serial.17.15.01a.qcow2",
+            "version": "17.15.01a 8G",
+            "md5sum": "41efa0aedd67f1f57cde1263c79d9ff6",
+            "filesize": 1846280192,
+            "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/IOSXE-17.15.1a"
+        },
+        {
+            "filename": "c8000v-universalk9_8G_serial.17.09.04a.qcow2",
+            "version": "17.09.04a 8G",
+            "md5sum": "d5dcba52b522f41648538737af80cdf9",
+            "filesize": 1858142208,
+            "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/Cupertino-17.9.4a"
+        },
+		{
             "filename": "c8000v-universalk9_8G_serial.17.09.01a.qcow2",
             "version": "17.09.01a 8G",
             "md5sum": "a10ae2c4d71f4eb611bc4d83ad7709f0",
             "filesize": 1856634880,
-            "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/Bengaluru-17.6.5"
+            "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/Cupertino-17.9.1a"
         },
         {
             "filename": "c8000v-universalk9_8G_serial.17.06.05.qcow2",
@@ -62,6 +76,18 @@
     ],
     "versions": [
         {
+            "name": "17.15.01a 8G",
+            "images": {
+                "hda_disk_image": "c8000v-universalk9_8G_serial.17.15.01a.qcow2"
+            }
+        },
+        {
+            "name": "17.09.04a 8G",
+            "images": {
+                "hda_disk_image": "c8000v-universalk9_8G_serial.17.09.04a.qcow2"
+            }
+        },
+		{
             "name": "17.09.01a 8G",
             "images": {
                 "hda_disk_image": "c8000v-universalk9_8G_serial.17.09.01a.qcow2"

gns3server/appliances/cisco-cat9k.gns3a

@@ -5,27 +5,34 @@
     "description": "Cisco IOS-XE 9000v. This appliance requires 16GB of memory to run! Recommend 2 or more vCPUs for faster boot performance",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
-    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/2-5/#!cml-release-notes",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/cat-9000v/",
     "product_name": "Cisco CAT IOS-XE 9000v",
-    "product_url": "http://virl.cisco.com/",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "There is no default configuration present. Virtual Switch and Interfaces may take several minutes to be usable after appliance boot.",
+    "usage": "There is no default configuration present. Virtual Switch and Interfaces may take several minutes to be usable after appliance boot.\n\nOnly has basic Layer 2 switching features. Will need to enable advance features and reboot to gain access to things like BGP, etc... \n\nconfigure terminal \nlicense boot level network-advantage addon dna-advantage \nend \nwrite memory \nreload",
     "first_port_name": "GigabitEthernet0/0",
     "port_name_format": "GigabitEthernet1/0/{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 9,
-        "ram": 16384,
-	"cpus": 2,
+        "ram": 24576,
+	"cpus": 4,
         "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"
 		},
     "images": [
+        {
+            "filename": "cat9kv-prd-17.12.01prd9.qcow2",
+            "version": "17.12(1)",
+            "md5sum": "e587e92186f42bdf69d7fa27f34425f7",
+            "filesize": 2739404800,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
         {
             "filename": "cat9kv-prd-17.10.01prd7.qcow2",
             "version": "17.10(1)",
@@ -35,6 +42,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "17.12(1)",
+            "images": {
+                "hda_disk_image": "cat9kv-prd-17.12.01prd9.qcow2"
+            }
+		},
         {
             "name": "17.10(1)",
             "images": {

gns3server/appliances/cisco-csr1000v.gns3a

@@ -5,9 +5,9 @@
     "description": "The Cisco Cloud Services Router 1000V (CSR 1000V) is a router and network services platform in virtual form factor that is intended for deployment in cloud and virtual data centers. It is optimized to serve as a single-tenant or multitenant WAN gateway. Using proven, industry-leading Cisco IOS\u00ae XE Software networking and security features, the CSR 1000V enables enterprises to transparently extend their WANs into external provider-hosted clouds and cloud providers to offer their tenants enterprise-class networking services.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
-    "documentation_url": "http://www.cisco.com/c/en/us/support/routers/cloud-services-router-1000v-series/products-installation-and-configuration-guides-list.html",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/csr-1000v/",
     "product_name": "CSR1000v",
-    "product_url": "http://www.cisco.com/c/en/us/support/routers/cloud-services-router-1000v-series/tsd-products-support-series-home.html",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
@@ -24,12 +24,26 @@
         "kvm": "require"
     },
     "images": [
+		{
+            "filename": "csr1000v-universalk9.17.03.08a-serial.qcow2",
+            "version": "17.03.08a",
+            "md5sum": "6abece87d6db99d9fd6917203e253f91",
+            "filesize": 1421410304,
+            "download_url": "https://software.cisco.com/download/home/286323714/type/282046477/release/Amsterdam-17.3.8a"
+        },
         {
             "filename": "csr1000v-universalk9.17.03.06-serial.qcow2",
             "version": "17.03.06",
             "md5sum": "086ab9bef6e66de847af0da3910c60e8",
             "filesize": 1422000128,
-            "download_url": "https://software.cisco.com/download/home/284364978/type/282046477/release/Gibraltar-16.12.3"
+            "download_url": "https://software.cisco.com/download/home/286323714/type/282046477/release/Amsterdam-17.3.6"
+        },
+		{
+            "filename": "csr1000v-ucmk9.16.12.5-serial.qcow2",
+            "version": "16.12.05",
+            "md5sum": "5c0cc217f0f0648407b34b11a1dd5b8e",
+            "filesize": 844103680,
+            "download_url": "https://software.cisco.com/download/home/286323714/type/286321980/release/16.12.5"
         },
         {
             "filename": "csr1000v-universalk9.16.12.03-serial.qcow2",
@@ -155,7 +169,7 @@
             "version": "16.4.1",
             "md5sum": "3428e0dcf5132a1b11ab7696d8c61b2e",
             "filesize": 1261961216,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "csr1000v-universalk9.16.6.1.qcow2",
@@ -166,13 +180,25 @@
         }
     ],
     "versions": [
+		{
+            "name": "17.03.08a",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.17.03.08a-serial.qcow2"
+            }
+        },
         {
             "name": "17.03.06",
             "images": {
                 "hda_disk_image": "csr1000v-universalk9.17.03.06-serial.qcow2"
             }
         },
-        {
+		{
+            "name": "16.12.05",
+            "images": {
+                "hda_disk_image": "csr1000v-ucmk9.16.12.5-serial.qcow2"
+            }
+        },
+		{
             "name": "16.12.3",
             "images": {
                 "hda_disk_image": "csr1000v-universalk9.16.12.03-serial.qcow2"

gns3server/appliances/cisco-iosv.gns3a

@@ -5,8 +5,9 @@
     "description": "Cisco Virtual IOS allows user to run IOS on a standard computer.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/iol/",
     "product_name": "IOSv",
-    "product_url": "http://virl.cisco.com/",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",
@@ -25,12 +26,18 @@
     },
     "images": [
         {
-            "filename": "IOSv_startup_config.img",
-            "version": "1",
-            "md5sum": "bc605651c4688276f81fd59dcf5cc786",
-            "filesize": 1048576,
-            "download_url": "https://sourceforge.net/projects/gns-3/files",
-            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/IOSv_startup_config.img/download"
+            "filename": "vios-adventerprisek9-m.spa.159-3.m9.qcow2",
+            "version": "15.9(3)M9",
+            "md5sum": "01b707a2e33185d6d33e0255ced45d23",
+            "filesize": 57323008,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
+        {
+            "filename": "vios-adventerprisek9-m.spa.159-3.m8.qcow2",
+            "version": "15.9(3)M8",
+            "md5sum": "8d93a185c2fa778178a933f20b02150a",
+            "filesize": 57319424,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "vios-adventerprisek9-m.spa.159-3.m6.qcow2",
@@ -94,9 +101,31 @@
             "md5sum": "79f613ac3b179d5a64520730925130b2",
             "filesize": 127926272,
             "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
+        {
+            "filename": "IOSv_startup_config.img",
+            "version": "1",
+            "md5sum": "bc605651c4688276f81fd59dcf5cc786",
+            "filesize": 1048576,
+            "download_url": "https://sourceforge.net/projects/gns-3/files",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/IOSv_startup_config.img/download"
         }
     ],
     "versions": [
+        {
+            "name": "15.9(3)M9",
+            "images": {
+                "hda_disk_image": "vios-adventerprisek9-m.spa.159-3.m9.qcow2",
+                "hdb_disk_image": "IOSv_startup_config.img"
+            }
+        },
+        {
+            "name": "15.9(3)M8",
+            "images": {
+                "hda_disk_image": "vios-adventerprisek9-m.spa.159-3.m8.qcow2",
+                "hdb_disk_image": "IOSv_startup_config.img"
+            }
+        },
         {
             "name": "15.9(3)M6",
             "images": {

gns3server/appliances/cisco-iosvl2.gns3a

@@ -5,8 +5,9 @@
     "description": "Cisco Virtual IOS L2 allows user to run a IOS switching image on a standard computer.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/iosvl2/",
     "product_name": "IOSvL2",
-    "product_url": "http://virl.cisco.com/",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",

gns3server/appliances/cisco-iosxrv.gns3a

@@ -5,9 +5,9 @@
     "description": "IOS XRv supports the control plane features introduced in Cisco IOS XR.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
-    "documentation_url": "http://www.cisco.com/c/en/us/td/docs/ios_xr_sw/ios_xrv/release/notes/xrv-rn.html",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/ios-xrv/",
     "product_name": "IOS XRv",
-    "product_url": "http://virl.cisco.com/",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",

gns3server/appliances/cisco-iosxrv9k.gns3a

@@ -5,9 +5,9 @@
     "description": "IOS XRv 9000 (aka Sunstone) is the 1st VM released running the 64-bit IOS XR operating system as used on the NCS-6xxx platform. This appliance requires 4 vCPUs and 16GB of memory to run!",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
-    "documentation_url": "http://www.cisco.com/c/en/us/td/docs/ios_xr_sw/ios_xrv/release/notes/xrv-rn.html",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/ios-xrv-9000/",
     "product_name": "IOS XRv 9000",
-    "product_url": "http://virl.cisco.com/",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
@@ -26,92 +26,35 @@
         "options": "-smp 4 -cpu host"
     },
     "images": [
+        {
+            "filename": "xrv9k-fullk9-x-24.3.1.qcow2",
+            "version": "24.3.1",
+            "md5sum": "bd047c457e29952f265583f299bab845",
+            "filesize": 1704658432,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
         {
             "filename": "xrv9k-fullk9-x-7.7.1.qcow2",
             "version": "7.7.1",
             "md5sum": "682fff40d2ff373d8da3342906553b54",
             "filesize": 1643905024,
-            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/7.1.1"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "xrv9k-fullk9-x-7.1.1.qcow2",
             "version": "7.1.1",
             "md5sum": "dcf241e3f8df0151fec2c7bfac9d96ac",
             "filesize": 1443758080,
-            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/7.1.1"
-        },
-        {
-            "filename": "xrv9k-fullk9-x-7.0.1.qcow2",
-            "version": "7.0.1",
-            "md5sum": "ca2817767fa546e303c3c536e211d33e",
-            "filesize": 1446445056,
-            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/7.0.1"
-        },
-        {
-            "filename": "xrv9k-fullk9-x-6.6.2.qcow2",
-            "version": "6.6.2",
-            "md5sum": "fd630be3c449e625073286a3a66021ae",
-            "filesize": 1452998656,
-            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.6.2"
-        },
-        {
-            "filename": "xrv9k-fullk9-x-6.5.3.qcow2",
-            "version": "6.5.3",
-            "md5sum": "71f018e3ea895b663129090fb4f0ff40",
-            "filesize": 1205075968,
-            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.5.3"
-        },
-        {
-            "filename": "xrv9k-fullk9-x-6.5.2.qcow2",
-            "version": "6.5.2",
-            "md5sum": "506d9e23dda7365c99dd82b613859697",
-            "filesize": 1205010432,
-            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.5.1"
-        },
-        {
-            "filename": "xrv9k-fullk9-x-6.5.1.qcow2",
-            "version": "6.5.1",
-            "md5sum": "730868e7cd46de9aa2e950899c7f9498",
-            "filesize": 1208811520,
-            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.5.1"
-        },
-        {
-            "filename": "xrv9k-fullk9-x-6.4.2.qcow2",
-            "version": "6.4.2",
-            "md5sum": "6958763192c7bb59a1b8049d377de1b4",
-            "filesize": 1311703040,
-            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.4.2"
-        },
-        {
-            "filename": "xrv9k-fullk9-x-6.4.1.qcow2",
-            "version": "6.4.1",
-            "md5sum": "9c56b684e307706005a503e289cb9317",
-            "filesize": 1304887296,
-            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.4.1"
-        },
-        {
-            "filename": "xrv9k-fullk9-x-6.2.25.qcow2",
-            "version": "6.2.25",
-            "md5sum": "3f54e62b6f7cedfb2607233e5e465766",
-            "filesize": 1190723584,
-            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
-        },
-        {
-            "filename": "xrv9k-fullk9-x.qcow2-6.0.1",
-            "version": "6.0.1",
-            "md5sum": "e20d046807075046c35b6ce7d6766a7f",
-            "filesize": 2109210624,
-            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
-        },
-        {
-            "filename": "xrv9k-fullk9-x.qcow2-6.0.0",
-            "version": "6.0.0",
-            "md5sum": "64c538c34252aaeb4ed1ddb93d6803fd",
-            "filesize": 2572943360,
             "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         }
     ],
     "versions": [
+        {
+            "name": "24.3.1",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x-24.3.1.qcow2"
+            }
+        },
         {
             "name": "7.7.1",
             "images": {
@@ -123,66 +66,6 @@
             "images": {
                 "hda_disk_image": "xrv9k-fullk9-x-7.1.1.qcow2"
             }
-        },
-        {
-            "name": "7.0.1",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x-7.0.1.qcow2"
-            }
-        },
-        {
-            "name": "6.6.2",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x-6.6.2.qcow2"
-            }
-        },
-        {
-            "name": "6.5.3",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x-6.5.3.qcow2"
-            }
-        },
-        {
-            "name": "6.5.2",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x-6.5.2.qcow2"
-            }
-        },
-        {
-            "name": "6.5.1",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x-6.5.1.qcow2"
-            }
-        },
-        {
-            "name": "6.4.2",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x-6.4.2.qcow2"
-            }
-        },
-        {
-            "name": "6.4.1",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x-6.4.1.qcow2"
-            }
-        },
-        {
-            "name": "6.2.25",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x-6.2.25.qcow2"
-            }
-        },
-        {
-            "name": "6.0.1",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x.qcow2-6.0.1"
-            }
-        },
-        {
-            "name": "6.0.0",
-            "images": {
-                "hda_disk_image": "xrv9k-fullk9-x.qcow2-6.0.0"
-            }
         }
     ]
 }

gns3server/appliances/cisco-iou-l2.gns3a

@@ -5,7 +5,9 @@
     "description": "Cisco IOS on UNIX Layer 2 image.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/iol-l2/",
     "product_name": "Cisco IOU L2",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
@@ -13,11 +15,23 @@
     "iou": {
         "ethernet_adapters": 4,
         "serial_adapters": 0,
-        "nvram": 128,
-        "ram": 256,
+        "nvram": 512,
+        "ram": 512,
         "startup_config": "iou_l2_base_startup-config.txt"
     },
     "images": [
+        {
+            "filename": "x86_64_crb_linux_l2-adventerprisek9-ms.iol",
+            "version": "17.15.1",
+            "md5sum": "6c587cdfd5056078e70b3f6c26800d66",
+            "filesize": 243251976
+        },
+        {
+            "filename": "x86_64_crb_linux_l2-adventerprisek9-ms",
+            "version": "17.12.1",
+            "md5sum": "2b5055e4cef8fd257416d74a94adb626",
+            "filesize": 240355720
+        },
         {
             "filename": "i86bi-linux-l2-ipbasek9-15.1g.bin",
             "version": "15.1g",
@@ -38,6 +52,18 @@
         }
     ],
     "versions": [
+        {
+            "name": "17.15.1",
+            "images": {
+                "image": "x86_64_crb_linux_l2-adventerprisek9-ms.iol"
+            }
+        },
+        {
+            "name": "17.12.1",
+            "images": {
+                "image": "x86_64_crb_linux_l2-adventerprisek9-ms"
+            }
+        },
         {
             "name": "15.1g",
             "images": {

gns3server/appliances/cisco-iou-l3.gns3a

@@ -5,7 +5,9 @@
     "description": "Cisco IOS on UNIX Layer 3 image.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/iol/",
     "product_name": "Cisco IOU L3",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
@@ -13,11 +15,23 @@
     "iou": {
         "ethernet_adapters": 2,
         "serial_adapters": 2,
-        "nvram": 128,
-        "ram": 256,
+        "nvram": 512,
+        "ram": 512,
         "startup_config": "iou_l3_base_startup-config.txt"
     },
     "images": [
+        {
+            "filename": "x86_64_crb_linux-adventerprisek9-ms.iol",
+            "version": "17.15.1",
+            "md5sum": "5d584f6cfbeaadc87d55f613da1049ed",
+            "filesize": 292001512
+        },
+        {
+            "filename": "x86_64_crb_linux-adventerprisek9-ms",
+            "version": "17.12.1",
+            "md5sum": "4a2fce8de21d1831fbceffd155e41ae7",
+            "filesize": 288947184
+        },
         {
             "filename": "i86bi_LinuxL3-AdvEnterpriseK9-M2_157_3_May_2018.bin",
             "version": "15.7(3)M2",
@@ -38,6 +52,18 @@
         }
     ],
     "versions": [
+        {
+            "name": "17.15.1",
+            "images": {
+                "image": "x86_64_crb_linux-adventerprisek9-ms.iol"
+            }
+        },
+        {
+            "name": "17.12.1",
+            "images": {
+                "image": "x86_64_crb_linux-adventerprisek9-ms"
+            }
+        },
         {
             "name": "15.7(3)M2",
             "images": {

gns3server/appliances/cisco-nxosv.gns3a

@@ -5,8 +5,9 @@
     "description": "NXOSv is a reference platform for an implementation of the Cisco Nexus operating system, based on the Nexus 7000-series platforms, running as a full virtual machine on a hypervisor. This includes NXAPI and MPLS LDP support.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/nx-os/",
     "product_name": "NX-OSv",
-    "product_url": "http://virl.cisco.com/",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "stable",
     "maintainer": "GNS3 Team",

gns3server/appliances/cisco-nxosv9k.gns3a

@@ -5,8 +5,9 @@
     "description": "The NX-OSv 9000 is a virtual platform that is designed to simulate the control plane aspects of a network element running Cisco Nexus 9000 software. The NX-OSv 9000 shares the same software image running on Cisco Nexus 9000 hardware platform although no specific hardware emulation is implemented. When the software runs as a virtual machine, line card (LC) ASIC provisioning or any interaction from the control plane to hardware ASIC is handled by the NX-OSv 9000 software data plane.\nThe NX-OSv 9000 for the Cisco Nexus 9000 Series provides a useful tool to enable the devops model and rapidly test changes to the infrastructure or to infrastructure automation tools. This enables network simulations in large scale for customers to validate configuration changes on a simulated network prior to applying them on a production network. Some users have also expressed interest in using the simulation system for feature test ,verification, and automation tooling development and test simualtion prior to deployment. NX-OSv 9000 can be used as a programmability vehicle to validate software defined networks (SDNs) and Network Function Virtualization (NFV) based solutions.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
-    "documentation_url": "http://www.cisco.com/c/en/us/td/docs/switches/datacenter/nexus9000/sw/7-x/nx-osv/configuration/guide/b_NX-OSv_9000/b_NX-OSv_chapter_01.html",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/nx-os-9000/",
     "product_name": "NX-OSv 9000",
+    "product_url": "https://developer.cisco.com/modeling-labs/",
     "registry_version": 4,
     "status": "stable",
     "availability": "service-contract",
@@ -26,12 +27,33 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "nexus9500v64.10.5.1.F.qcow2",
+            "version": "9500v 10.5.1.F",
+            "md5sum": "2fa6fb4dd4c5e49d53896d60fa746e59",
+            "filesize": 2388459520,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.5(1)"
+        },
+        {
+            "filename": "nexus9300v64.10.5.1.F.qcow2",
+            "version": "9300v 10.5.1.F",
+            "md5sum": "2bbc767debbc7c1144eabe176ae67503",
+            "filesize": 2388393984,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.5(1)"
+        },
+        {
+            "filename": "nexus9500v64.10.3.1.F.qcow2",
+            "version": "9500v 10.3.1.F",
+            "md5sum": "41e3c1c0c003b13f1bf774f0d1873e87",
+            "filesize": 2097510400,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.3(1)"
+        },
         {
             "filename": "nexus9300v64.10.3.1.F.qcow2",
             "version": "9300v 10.3.1.F",
             "md5sum": "a6ffd2501a5791c11cee319943b912da",
             "filesize": 2097086464,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.1(1)"
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.3(1)"
         },
         {
             "filename": "nexus9500v64.10.1.1.qcow2",
@@ -47,181 +69,6 @@
             "filesize": 1990983680,
             "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.1(1)"
         },
-        {
-            "filename": "nexus9500v.9.3.13.qcow2",
-            "version": "9500v 9.3.13",
-            "md5sum": "bacf0f664ee34625c85a9f278b2466a2",
-            "filesize": 2248409088,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(13)"
-        },
-        {
-            "filename": "nexus9300v.9.3.13.qcow2",
-            "version": "9300v 9.3.13",
-            "md5sum": "d8ce30cb762df02d77ec27786a2435ad",
-            "filesize": 2248343552,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(13)"
-        },
-        {
-            "filename": "nexus9500v.9.3.12.qcow2",
-            "version": "9500v 9.3.12",
-            "md5sum": "452e5cb2a7a25feaa3ba0624a82ff9ca",
-            "filesize": 1997996032,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(12)"
-        },
-        {
-            "filename": "nexus9300v.9.3.12.qcow2",
-            "version": "9300v 9.3.12",
-            "md5sum": "7b6b5dad1001e11d6ebb54662616e9f2",
-            "filesize": 1997930496,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(12)"
-        },
-        {
-            "filename": "nexus9500v.9.3.9.qcow2",
-            "version": "9500v 9.3.9",
-            "md5sum": "30c25039927f89aebe73ea20d15abd6d",
-            "filesize": 1980760064,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(9)"
-        },
-        {
-            "filename": "nexus9300v.9.3.9.qcow2",
-            "version": "9300v 9.3.9",
-            "md5sum": "e807005cb7d2d2957b4af0e59f368b36",
-            "filesize": 1980563456,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(9)"
-        },
-        {
-            "filename": "nexus9300v.9.3.8.qcow2",
-            "version": "9300v 9.3.8",
-            "md5sum": "f8bd834f8395c134dc98d895c98441af",
-            "filesize": 1976434688,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(8)"
-        },
-        {
-            "filename": "nexus9500v.9.3.7.qcow2",
-            "version": "9500v 9.3.7",
-            "md5sum": "65f669e0dd379a05a8cdbb9d7592a064",
-            "filesize": 1986068480,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(7)"
-        },
-        {
-            "filename": "nexus9500v.9.3.3.qcow2",
-            "version": "9500v 9.3.3",
-            "md5sum": "7230c944041fdaa0e1b18cecccbc9a32",
-            "filesize": 1714159616,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(3)"
-        },
-        {
-            "filename": "nexus9300v.9.3.3.qcow2",
-            "version": "9300v 9.3.3",
-            "md5sum": "8e9a7c4815907ef47d850623f77042e2",
-            "filesize": 1714225152,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(3)"
-        },
-        {
-            "filename": "nxosv.9.3.1.qcow2",
-            "version": "9.3.1",
-            "md5sum": "148fd38cb1ff78df2883f844e172fad9",
-            "filesize": 1435041792,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(1)?i=!pp"
-        },
-        {
-            "filename": "nxosv-final.9.2.3.qcow2",
-            "version": "9.2.3",
-            "md5sum": "74bd9a5b4970e868685f753e48979194",
-            "filesize": 1357643776,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.2%25283%2529"
-        },
-        {
-            "filename": "nxosv-final.9.2.2.qcow2",
-            "version": "9.2.2",
-            "md5sum": "2119702c488552fc4d1b4210a04d4f64",
-            "filesize": 1344077824,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.2%25281%2529"
-        },
-        {
-            "filename": "nxosv-final.9.2.1.qcow2",
-            "version": "9.2.1",
-            "md5sum": "1d7fa4654602d7ffbf62544edfe71986",
-            "filesize": 1330315264,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.2%25281%2529"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I7.9.qcow2",
-            "version": "7.0.3.I7.9",
-            "md5sum": "50678c719f6b822c43dd096dbdf359e8",
-            "filesize": 1003618304,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/7.0(3)I7(9)?i=!pp"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I7.7.qcow2",
-            "version": "7.0.3.I7.7",
-            "md5sum": "5daab34b672f9534c9aee59a6c8903b3",
-            "filesize": 996212736,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/7.0%25283%2529I7%25287%2529"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I7.6.qcow2",
-            "version": "7.0.3.I7.6",
-            "md5sum": "a122ee954b4c11761abd99291b70544e",
-            "filesize": 1031995392,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/7.0%25283%2529I7%25286%2529"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I7.5.qcow2",
-            "version": "7.0.3.I7.5",
-            "md5sum": "68a4008e189c8a35ccb8ee58db9608bb",
-            "filesize": 1027670016,
-            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/7.0%25283%2529I7%25285%2529"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I7.4.qcow2",
-            "version": "7.0.3.I7.4",
-            "md5sum": "1e980c95ca47045ae45ded6e07fabfb8",
-            "filesize": 985792512,
-            "download_url": "https://software.cisco.com/download/"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I7.3.qcow2",
-            "version": "7.0.3.I7.3",
-            "md5sum": "9d7a20367bf681a239f14097bbce470a",
-            "filesize": 983629824,
-            "download_url": "https://software.cisco.com/download/"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I7.2.qcow2",
-            "version": "7.0.3.I7.2",
-            "md5sum": "17295efb13e83b24a439148449bfd5ab",
-            "filesize": 906231808,
-            "download_url": "https://software.cisco.com/download/"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I7.1.qcow2",
-            "version": "7.0.3.I7.1",
-            "md5sum": "3c122f27d0c3684c63657207eadf4d06",
-            "filesize": 903151616,
-            "download_url": "https://software.cisco.com/download/"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I6.1.qcow2",
-            "version": "7.0.3.I6.1",
-            "md5sum": "18bb991b814a508d1190575f99deed99",
-            "filesize": 780402688,
-            "download_url": "https://software.cisco.com/download/"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I5.2.qcow2",
-            "version": "7.0.3.I5.2",
-            "md5sum": "c06aaa02f758a64fd8fee9406756f1da",
-            "filesize": 777715712,
-            "download_url": "https://software.cisco.com/download/"
-        },
-        {
-            "filename": "nxosv-final.7.0.3.I5.1.qcow2",
-            "version": "7.0.3.I5.1",
-            "md5sum": "201ea658fa4c57452ee4b2aa4f5262a7",
-            "filesize": 784990208,
-            "download_url": "https://software.cisco.com/download/"
-        },
         {
             "filename": "OVMF-edk2-stable202305.fd",
             "version": "stable202305",
@@ -233,6 +80,27 @@
         }
     ],
     "versions": [
+        {
+            "name": "9500v 10.5.1.F",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "nexus9500v64.10.5.1.F.qcow2"
+            }
+        },
+        {
+            "name": "9300v 10.5.1.F",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "nexus9300v64.10.5.1.F.qcow2"
+            }
+        },
+        {
+            "name": "9500v 10.3.1.F",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "nexus9500v64.10.3.1.F.qcow2"
+            }
+        },
         {
             "name": "9300v 10.3.1.F",
             "images": {
@@ -253,181 +121,6 @@
                 "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nexus9300v.10.1.1.qcow2"
             }
-        },
-        {
-            "name": "9500v 9.3.13",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9500v.9.3.13.qcow2"
-            }
-        },
-        {
-            "name": "9300v 9.3.13",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9300v.9.3.13.qcow2"
-            }
-        },
-		        {
-            "name": "9500v 9.3.12",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9500v.9.3.12.qcow2"
-            }
-        },
-        {
-            "name": "9300v 9.3.12",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9300v.9.3.12.qcow2"
-            }
-        },
-        {
-            "name": "9500v 9.3.9",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9500v.9.3.9.qcow2"
-            }
-        },
-        {
-            "name": "9300v 9.3.9",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9300v.9.3.9.qcow2"
-            }
-        },
-        {
-            "name": "9300v 9.3.8",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9300v.9.3.8.qcow2"
-            }
-        },
-        {
-            "name": "9500v 9.3.7",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9500v.9.3.7.qcow2"
-            }
-        },
-        {
-            "name": "9500v 9.3.3",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9500v.9.3.3.qcow2"
-            }
-        },
-        {
-            "name": "9300v 9.3.3",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nexus9300v.9.3.3.qcow2"
-            }
-        },
-        {
-            "name": "9.3.1",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv.9.3.1.qcow2"
-            }
-        },
-        {
-            "name": "9.2.3",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.9.2.3.qcow2"
-            }
-        },
-        {
-            "name": "9.2.2",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.9.2.2.qcow2"
-            }
-        },
-        {
-            "name": "9.2.1",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.9.2.1.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I7.9",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I7.9.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I7.7",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I7.7.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I7.6",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I7.6.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I7.5",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I7.5.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I7.4",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I7.4.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I7.3",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I7.3.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I7.2",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I7.2.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I7.1",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I7.1.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I6.1",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I6.1.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I5.2",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I5.2.qcow2"
-            }
-        },
-        {
-            "name": "7.0.3.I5.1",
-            "images": {
-                "bios_image": "OVMF-edk2-stable202305.fd",
-                "hda_disk_image": "nxosv-final.7.0.3.I5.1.qcow2"
-            }
         }
     ]
 }

gns3server/appliances/cisco-vWLC.gns3a

@@ -28,7 +28,21 @@
         "options": ""
     },
     "images": [
-        {
+		{
+            "filename": "MFG_CTVM_8_10_196_0.iso",
+            "version": "8.10.196.0",
+            "md5sum": "6093aca44dcf45c999f83e62dc9aeea2",
+            "filesize": 650809344,
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=8.10.196.0"
+        },
+		{
+            "filename": "MFG_CTVM_8_5_182_0.iso",
+            "version": "8.5.182.0",
+            "md5sum": "1cf3c57c2b123e739ab4662ea0abbc34",
+            "filesize": 388579328,
+            "download_url": "https://software.cisco.com/download/home/284464214/type/280926587/release/8.5.182.0"
+        },
+		{
             "filename": "MFG_CTVM_8_3_102_0.iso",
             "version": "8.3.102.0",
             "md5sum": "7f6b7968b5bed04b5ecc119b6ba4e41c",
@@ -73,6 +87,20 @@
         }
     ],
     "versions": [
+	{
+            "name": "8.10.196.0",
+            "images": {
+                "hda_disk_image": "empty8G.qcow2",
+                "cdrom_image": "MFG_CTVM_8_10_196_0.iso"
+            }
+        },
+		{
+            "name": "8.5.182.0",
+            "images": {
+                "hda_disk_image": "empty8G.qcow2",
+                "cdrom_image": "MFG_CTVM_8_5_182_0.iso"
+            }
+        },
         {
             "name": "8.3.102.0",
             "images": {

gns3server/appliances/clavister-netsheild.gns3a

@@ -5,7 +5,7 @@
     "description": "Clavister NetShield (cOS Stream) Virtual Appliance offers the same functionality as the Clavister NetShield physical NGappliances FWs in a virtual environment.",
     "vendor_name": "Clavister",
     "vendor_url": "https://www.clavister.com/",
-    "documentation_url": "https://kb.clavister.com",
+    "documentation_url": "https://docs.clavister.com",
     "product_name": "NetShield",
     "product_url": "https://www.clavister.com/products/netshield/",
     "registry_version": 4,
@@ -13,7 +13,7 @@
     "availability": "free-to-try",
     "maintainer": "Mattias Nordlund",
     "maintainer_email": "mattias.nordlund@clavister.com",
-    "usage": "No configuration by default, oen console to set IPs and activate configuration.",
+    "usage": "No configuration by default, use console to set IPs and activate configuration.",
     "port_name_format": "if{0}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
@@ -27,6 +27,13 @@
         "options": "-cpu Nehalem"
     },
     "images": [
+        {
+            "filename": "clavister-cos-stream-4.00.00.34-virtual-x64-generic.qcow2",
+            "version": "cOS Stream 4.00.00",
+            "md5sum": "02b480621d9bf1a9a4e116cd47bef006",
+            "filesize": 132841472,
+            "download_url": "https://my.clavister.com/download/86399b21-44c7-ee11-a434-005056bdfeb0"
+        },
         {
             "filename": "clavister-cos-stream-3.80.09.01-virtual-x64-generic.qcow2",
             "version": "cOS Stream 3.80.09",
@@ -36,6 +43,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "cOS Stream 4.00.00",
+            "images": {
+                "hda_disk_image": "clavister-cos-stream-4.00.00.34-virtual-x64-generic.qcow2"
+            }
+        },
         {
             "name": "cOS Stream 3.80.09",
             "images": {

gns3server/appliances/clavister-netwall.gns3a

@@ -5,7 +5,7 @@
     "description": "Clavister NetWall (cOS Core) Virtual Appliance offers the same functionality as the Clavister  NetWall physical NGFWs in a virtual environment.",
     "vendor_name": "Clavister",
     "vendor_url": "https://www.clavister.com/",
-    "documentation_url": "https://kb.clavister.com",
+    "documentation_url": "https://docs.clavister.com",
     "product_name": "NetWall",
     "product_url": "https://www.clavister.com/products/ngfw/",
     "registry_version": 4,
@@ -13,7 +13,7 @@
     "availability": "free-to-try",
     "maintainer": "Mattias Nordlund",
     "maintainer_email": "mattias.nordlund@clavister.com",
-    "usage": "DHCP enabled on all interfaces by default, WebUI/SSH access enabled on the local network connected to If1.",
+    "usage": "DHCP & cloud-init enabled on all interfaces by default, WebUI/SSH access enabled on the local network connected to If1.",
     "port_name_format": "If{0}",
     "qemu": {
         "adapter_type": "e1000",
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "clavister-cos-core-14.00.13.08-kvm-en.img",
+            "version": "cOS Core 14.00.13 (x86)",
+            "md5sum": "d36797077378accb2b8fc72d09d07ee1",
+            "filesize": 536870912,
+            "download_url": "https://my.clavister.com/download/f3f494a3-9ee7-ee11-a434-005056bdfeb0"
+        },
         {
             "filename": "clavister-cos-core-14.00.01.13-kvm-en.img",
             "version": "cOS Core 14.00.01 (x86)",
@@ -42,6 +49,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "cOS Core 14.00.13 (x86)",
+            "images": {
+                "hda_disk_image": "clavister-cos-core-14.00.13.08-kvm-en.img"
+            }
+        },
         {
             "name": "cOS Core 14.00.01 (x86)",
             "images": {

gns3server/appliances/debian.gns3a

@@ -23,6 +23,14 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "debian-12.6.qcow2",
+            "version": "12.6",
+            "md5sum": "04753ba14295c6414d49bffe27b676ae",
+            "filesize": 280907776,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/debian-12.6.qcow2"
+        },
         {
             "filename": "debian-12.4.qcow2",
             "version": "12.4",
@@ -31,6 +39,14 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
             "direct_download_url": "https://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/debian-12.4.qcow2"
         },
+        {
+            "filename": "debian-11.10.qcow2",
+            "version": "11.10",
+            "md5sum": "99a1dc8e110d641309674e69b630e732",
+            "filesize": 263520256,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/debian-11.10.qcow2"
+        },
         {
             "filename": "debian-11.8.qcow2",
             "version": "11.8",
@@ -41,12 +57,24 @@
         }
     ],
     "versions": [
+        {
+            "name": "12.6",
+            "images": {
+                "hda_disk_image": "debian-12.6.qcow2"
+            }
+        },
         {
             "name": "12.4",
             "images": {
                 "hda_disk_image": "debian-12.4.qcow2"
             }
         },
+        {
+            "name": "11.10",
+            "images": {
+                "hda_disk_image": "debian-11.10.qcow2"
+            }
+        },
         {
             "name": "11.8",
             "images": {

gns3server/appliances/exos.gns3a

@@ -26,163 +26,38 @@
         "kvm": "allow",
         "options": "-cpu core2duo"
     },
+    
     "images": [
-        {
-            "filename": "EXOS-VM_v32.1.1.6.qcow2",
-            "version": "32.1.1.6",
-            "md5sum": "48868bbcb4255d6365049b5941dd2af7",
-            "filesize": 231211008,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v32.1.1.6.qcow2"
+
+		{
+            "filename": "EXOS-VM_32.7.2.19.qcow2",
+            "version": "32.7.2.19",
+            "md5sum": "eba580a2e18d2a9cc972c9ece8917ea8",
+            "filesize": 236847104,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_32.7.2.19.qcow2"
         },
         {
-            "filename": "EXOS-VM_v31.7.1.4.qcow2",
-            "version": "31.7.1.4",
-            "md5sum": "a70e4fa3bc361434237ad12937aaf0fb",
-            "filesize": 458227712,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v31.7.1.4.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v31.1.1.3.qcow2",
-            "version": "31.1.1.3",
-            "md5sum": "e4936ad94a5304bfeeca8dfc6f285cc0",
-            "filesize": 561512448,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v31.1.1.3.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.7.1.1.qcow2",
-            "version": "30.7.1.1",
-            "md5sum": "c6b67023945102f984b47aa67c67fe33",
-            "filesize": 485687296,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.7.1.1.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.6.1.11.qcow2",
-            "version": "30.6.1.11",
-            "md5sum": "bf3e13570417d7e3464165b344c196eb",
-            "filesize": 475332608,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.6.1.11.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.5.1.15.qcow2",
-            "version": "30.5.1.15",
-            "md5sum": "380d0c7bb8f0aa272ceb84b85f367a63",
-            "filesize": 498663424,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.5.1.15.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.4.1.2.qcow2",
-            "version": "30.4.1.2",
-            "md5sum": "133fa38bf80daec9e389729c96e692c0",
-            "filesize": 454557696,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.4.1.2.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.3.1.6.qcow2",
-            "version": "30.3.1.6",
-            "md5sum": "edb86b406efe99434c6d5366d9bfa97f",
-            "filesize": 448266240,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.3.1.6.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.2.1.8.qcow2",
-            "version": "30.2.1.8",
-            "md5sum": "4bdbf3ddff7a030e19c6bb71270b56d2",
-            "filesize": 355205120,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.2.1.8.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.1.1.4.qcow2",
-            "version": "30.1.1.4",
-            "md5sum": "92d3f9b13d750f7bfa804823fa545772",
-            "filesize": 383385600,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.1.1.4.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v22.7.1.2.qcow2",
-            "version": "22.7.1.2",
-            "md5sum": "a13e839b3fa05e8a5b0fb31f7e3dda86",
-            "filesize": 180420608,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.7.1.2.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v21.1.1.4-disk1.qcow2",
-            "version": "21.1.1.4",
-            "md5sum": "654606809b6fd3bca400377483eb4a79",
-            "filesize": 117560832,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v21.1.1.4-disk1.qcow2"
+            "filename": "EXOS-VM_v32.6.3.126.qcow2",
+            "version": "32.6.3.126",
+            "md5sum": "5856b6c427bd605fe1c7adb6ee6b2659",
+            "filesize": 236716032,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v32.6.3.126.qcow2"
         }
+
     ],
+    
     "versions": [
+
         {
-            "name": "32.1.1.6",
+            "name": "32.7.2.19",
             "images": {
-                "hda_disk_image": "EXOS-VM_v32.1.1.6.qcow2"
+                "hda_disk_image": "EXOS-VM_32.7.2.19.qcow2"
             }
         },
         {
-            "name": "31.7.1.4",
+            "name": "32.6.3.126",
             "images": {
-                "hda_disk_image": "EXOS-VM_v31.7.1.4.qcow2"
-            }
-        },
-        {
-            "name": "31.1.1.3",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v31.1.1.3.qcow2"
-            }
-        },
-        {
-            "name": "30.7.1.1",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.7.1.1.qcow2"
-            }
-        },
-        {
-            "name": "30.6.1.11",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.6.1.11.qcow2"
-            }
-        },
-        {
-            "name": "30.5.1.15",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.5.1.15.qcow2"
-            }
-        },
-        {
-            "name": "30.4.1.2",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.4.1.2.qcow2"
-            }
-        },
-        {
-            "name": "30.3.1.6",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.3.1.6.qcow2"
-            }
-        },
-        {
-            "name": "30.2.1.8",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.2.1.8.qcow2"
-            }
-        },
-        {
-            "name": "30.1.1.4",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.1.1.4.qcow2"
-            }
-        },
-        {
-            "name": "22.7.1.2",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v22.7.1.2.qcow2"
-            }
-        },
-        {
-            "name": "21.1.1.4",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v21.1.1.4-disk1.qcow2"
+                "hda_disk_image": "EXOS-VM_v32.6.3.126.qcow2"
             }
         }
     ]

gns3server/appliances/fedora-cloud.gns3a

@@ -26,6 +26,22 @@
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2",
+            "version": "41-1.4",
+            "md5sum": "8efc9edc04f38775de72ce067166b2a1",
+            "filesize": 491716608,
+            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images",
+            "direct_download_url": "https://fedora.mirrorservice.org/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2"
+        },
+        {
+            "filename": "Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2",
+            "version": "40-1.14",
+            "md5sum": "3eed4b1a9de35208ed30d9bb72c1522d",
+            "filesize": 397475840,
+            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images",
+            "direct_download_url": "https://fedora.mirrorservice.org/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2"
+        },
         {
             "filename": "Fedora-Cloud-Base-39-1.5.x86_64.qcow2",
             "version": "39-1.5",
@@ -52,6 +68,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "41-1.4",
+            "images": {
+                "hda_disk_image": "Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2",
+                "cdrom_image": "fedora-cloud-init-data.iso"
+            }
+        },
+        {
+            "name": "40-1.14",
+            "images": {
+                "hda_disk_image": "Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2",
+                "cdrom_image": "fedora-cloud-init-data.iso"
+            }
+        },
         {
             "name": "39-1.5",
             "images": {

gns3server/appliances/fortiadc.gns3a

@@ -28,10 +28,17 @@
     },
     "images": [
         {
-            "filename": "FAD_KVM-FORTINET.out.kvm-data.qcow2",
-            "version": "ALL",
-            "md5sum": "b7500835594e62d8acb1c6ec43d597c1",
-            "filesize": 30998528,
+            "filename": "FAD_KVM-V7.4.4-build0347-FORTINET.out.kvm_boot.qcow2",
+            "version": "7.4.4",
+            "md5sum": "52fa343fd423a1a560473b8cf02f4c9c",
+            "filesize": 180617216,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-V7.2.6-build0257-FORTINET.out.kvm_boot.qcow2",
+            "version": "7.2.6",
+            "md5sum": "ed8c3622b12212786c310aa94c928f06",
+            "filesize": 146341888,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
         {
@@ -41,6 +48,13 @@
             "filesize": 145817600,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAD_KVM-v7.1.4-build0138-FORTINET.out.kvm_boot.qcow2",
+            "version": "7.1.4",
+            "md5sum": "d4b3ff27fc9d0461199d6066174744ca",
+            "filesize": 134152192,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAD_KVM-V7.1.1-build0117-FORTINET.out.kvm-boot.qcow2",
             "version": "7.1.1",
@@ -243,9 +257,30 @@
             "md5sum": "7a71f52bde93c0000b047626731b7aef",
             "filesize": 68026368,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-FORTINET.out.kvm-data.qcow2",
+            "version": "ALL",
+            "md5sum": "b7500835594e62d8acb1c6ec43d597c1",
+            "filesize": 30998528,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         }
     ],
     "versions": [
+        {
+            "name": "7.4.4",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V7.4.4-build0347-FORTINET.out.kvm_boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "7.2.6",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V7.2.6-build0257-FORTINET.out.kvm_boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
         {
             "name": "7.2.0",
             "images": {
@@ -253,6 +288,13 @@
                 "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
             }
         },
+        {
+            "name": "7.1.4",
+            "images": {
+                "hda_disk_image": "FAD_KVM-v7.1.4-build0138-FORTINET.out.kvm_boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
         {
             "name": "7.1.1",
             "images": {

gns3server/appliances/fortianalyzer.gns3a

@@ -29,6 +29,34 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAZ_VM64_KVM-v7.4.6.M-build2588-FORTINET.out.kvm.qcow2",
+            "version": "7.4.6",
+            "md5sum": "fba982436ff430465df6f6f283a2bd71",
+            "filesize": 511053824,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v7.4.5.M-build2553-FORTINET.out.kvm.qcow2",
+            "version": "7.4.5",
+            "md5sum": "78464ee460fce69c360901ca9ccfe4a0",
+            "filesize": 510988288,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v7.4.4.F-build2550-FORTINET.out.kvm.qcow2",
+            "version": "7.4.4",
+            "md5sum": "7bec1725b1e39dd66f4daae07492f1b4",
+            "filesize": 511217664,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v7.4.3-build2487-FORTINET.out.kvm.qcow2",
+            "version": "7.4.3",
+            "md5sum": "c58709af18516763ed88f58621447bf6",
+            "filesize": 504463360,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v7.4.2-build2397-FORTINET.out.kvm.qcow2",
             "version": "7.4.2",
@@ -43,6 +71,13 @@
             "filesize": 435310592,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAZ_VM64_KVM-v7.2.5-build1574-FORTINET.out.kvm.qcow2",
+            "version": "7.2.5",
+            "md5sum": "225d7405f35f78a482cffa34ef90080d",
+            "filesize": 379973632,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2",
             "version": "7.2.4",
@@ -64,6 +99,13 @@
             "filesize": 340631552,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAZ_VM64_KVM-v7.0.12-build0623-FORTINET.out.kvm.qcow2",
+            "version": "7.0.12",
+            "md5sum": "a45f8987ea13da836c684b5d9850c1c2",
+            "filesize": 349560832,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v7.0.11-build0595-FORTINET.out.kvm.qcow2",
             "version": "7.0.11",
@@ -256,6 +298,34 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.4.6",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.4.6.M-build2588-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.5",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.4.5.M-build2553-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.4",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.4.4.F-build2550-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.3",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.4.3-build2487-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.4.2",
             "images": {
@@ -270,6 +340,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.2.5",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.2.5-build1574-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.4",
             "images": {
@@ -291,6 +368,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.12",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.0.12-build0623-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.11",
             "images": {

gns3server/appliances/fortiauthenticator.gns3a

@@ -13,13 +13,13 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Default username is admin, no password is set. First book takes longer.",
+    "usage": "Default username is admin, no password is set. First boot takes longer.",
     "symbol": "fortinet.svg",
     "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 4,
-        "ram": 1024,
+        "ram": 4096,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
         "arch": "x86_64",
@@ -28,6 +28,27 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAC_VM_KVM-v6.6.1-build1660-FORTINET.out.kvm_fackvm.qcow2",
+            "version": "6.6.1",
+            "md5sum": "4b2b475ac8b6f88b5033dca367d53cbb",
+            "filesize": 138477584,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAC_VM_KVM-v6.5.5-build1385-FORTINET.out.kvm_fackvm.qcow2",
+            "version": "6.5.5",
+            "md5sum": "6850128ac51cee2577114ecd487786ff",
+            "filesize": 112918544,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAC_VM_KVM-v6.4.9-build1067-FORTINET.out.kvm_fackvm.qcow2",
+            "version": "6.4.9",
+            "md5sum": "aee068a16fb2ca332d41e6add499b7d3",
+            "filesize": 112197648,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAC_VM_KVM-v6-build0058-FORTINET.out.kvm.qcow2",
             "version": "6.0.3",
@@ -105,6 +126,20 @@
             "filesize": 62771200,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAC_VM_KVM-v6.6.1-build1660-FORTINET.out.kvm_datadrive.qcow2",
+            "version": "6.6.1",
+            "md5sum": "9bbaa1ce1508b4af1f43ba00879269f9",
+            "filesize": 197568,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAC_VM_KVM-v6.5.5-build1385-FORTINET.out.kvm_datadrive.qcow2",
+            "version": "6.4.x, 6.5.x",
+            "md5sum": "3f7173307047cf562f55ed2f99450c10",
+            "filesize": 197568,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAC_VM_KVM-ALL-DATADRIVE.qcow2",
             "version": "All",
@@ -114,6 +149,27 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.6.1",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v6.6.1-build1660-FORTINET.out.kvm_fackvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-v6.6.1-build1660-FORTINET.out.kvm_datadrive.qcow2"
+            }
+        },
+        {
+            "name": "6.5.5",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v6.5.5-build1385-FORTINET.out.kvm_fackvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-v6.5.5-build1385-FORTINET.out.kvm_datadrive.qcow2"
+            }
+        },
+        {
+            "name": "6.4.9",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v6.4.9-build1067-FORTINET.out.kvm_fackvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-v6.5.5-build1385-FORTINET.out.kvm_datadrive.qcow2"
+            }
+        },
         {
             "name": "6.0.3",
             "images": {

gns3server/appliances/fortigate.gns3a

@@ -28,6 +28,34 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FGT_VM64_KVM-v7.4.7.M-build2731-FORTINET.out.kvm.qcow2",
+            "version": "7.4.7",
+            "md5sum": "2ce4039789e84b3fe85565e0c4110718",
+            "filesize": 103677952,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v7.4.6.M-build2726-FORTINET.out.kvm.qcow2",
+            "version": "7.4.6",
+            "md5sum": "b787c1c5ab365f267d7e4e88b1cdc10b",
+            "filesize": 103677952,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v7.4.5.M-build2702-FORTINET.out.kvm.qcow2",
+            "version": "7.4.5",
+            "md5sum": "8465e74c4ef1751619ebb989838d457c",
+            "filesize": 102367232,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v7.4.4.F-build2662-FORTINET.out.kvm.qcow2",
+            "version": "7.4.4",
+            "md5sum": "dfe0e78827ec728631539669001bb23f",
+            "filesize": 102170624,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.4.3.F-build2573-FORTINET.out.kvm.qcow2",
             "version": "7.4.3",
@@ -42,6 +70,13 @@
             "filesize": 116064256,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FGT_VM64_KVM-v7.2.8.M-build1639-FORTINET.out.kvm_fortios.qcow2",
+            "version": "7.2.8",
+            "md5sum": "5c8fd4baf80aeb2999d4be5a9c49eb3d",
+            "filesize": 89980928,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.2.7.M-build1577-FORTINET.out.kvm.qcow2",
             "version": "7.2.7",
@@ -77,6 +112,13 @@
             "filesize": 86704128,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FGT_VM64_KVM-v7.0.15.M-build0601-FORTINET.out.kvm.qcow2",
+            "version": "7.0.15",
+            "md5sum": "423f50378b7e93098ab765c3dd3a788f",
+            "filesize": 77398016,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.0.14.M-build0601-FORTINET.out.kvm.qcow2",
             "version": "7.0.14",
@@ -367,6 +409,34 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.4.7",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.4.7.M-build2731-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.6",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.4.6.M-build2726-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.5",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.4.5.M-build2702-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.4",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.4.4.F-build2662-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.4.3",
             "images": {
@@ -381,6 +451,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.2.8",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.2.8.M-build1639-FORTINET.out.kvm_fortios.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.7",
             "images": {
@@ -416,6 +493,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.15",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.0.15.M-build0601-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.14",
             "images": {

gns3server/appliances/fortimanager.gns3a

@@ -29,6 +29,34 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FMG_VM64_KVM-v7.4.6.M-build2588-FORTINET.out.kvm.qcow2",
+            "version": "7.4.6",
+            "md5sum": "7cb219e1070d393f61cf750d818b23b1",
+            "filesize": 349122560,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v7.4.5.M-build2553-FORTINET.out.kvm.qcow2",
+            "version": "7.4.5",
+            "md5sum": "fa59ddce0cb933741f16866472026723",
+            "filesize": 349769728,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v7.4.4.F-build2550-FORTINET.out.kvm.qcow2",
+            "version": "7.4.4",
+            "md5sum": "770727bb30555e6938308bbf95f19555",
+            "filesize": 349847552,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v7.4.3-build2487-FORTINET.out.kvm.qcow2",
+            "version": "7.4.3",
+            "md5sum": "b01d9f86aa27c538407d518df1326863",
+            "filesize": 346107904,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.4.2-build2397-FORTINET.out.kvm.qcow2",
             "version": "7.4.2",
@@ -43,6 +71,13 @@
             "filesize": 309387264,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FMG_VM64_KVM-v7.2.5-build1574-FORTINET.out.kvm.qcow2",
+            "version": "7.2.5",
+            "md5sum": "754326845096afd909ec45d98f8d5a83",
+            "filesize": 278401024,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2",
             "version": "7.2.4",
@@ -64,6 +99,13 @@
             "filesize": 242814976,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FMG_VM64_KVM-v7.0.12-build0623-FORTINET.out.kvm.qcow2",
+            "version": "7.0.12",
+            "md5sum": "5b6f6a2b8bc00e56337aa7023a9025cf",
+            "filesize": 249520128,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.0.11-build0595-FORTINET.out.kvm.qcow2",
             "version": "7.0.11",
@@ -256,6 +298,34 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.4.6",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.4.6.M-build2588-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.5",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.4.5.M-build2553-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.4",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.4.4.F-build2550-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.3",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.4.3-build2487-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.4.2",
             "images": {
@@ -270,6 +340,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.2.5",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.2.5-build1574-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.4",
             "images": {
@@ -291,6 +368,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.12",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.0.12-build0623-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.11",
             "images": {

gns3server/appliances/fortiweb.gns3a

@@ -28,6 +28,27 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FWB_KVM-v7.6.0.F-build0962-FORTINET.out.kvm_boot.qcow2",
+            "version": "7.6.0",
+            "md5sum": "e94aa4af7ed0a12bd6084f0d74a2a96e",
+            "filesize": 329187840,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v7.4.3-build0638-FORTINET.out.kvm_boot.qcow2",
+            "version": "7.4.3",
+            "md5sum": "3c0ac11a6d80a319a4fe460aff5bc66c",
+            "filesize": 303497728,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v7.2.8-build0400-FORTINET.out.kvm_boot.qcow2",
+            "version": "7.2.8",
+            "md5sum": "367307242e6855dc190df089d196e712",
+            "filesize": 257950208,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FWB_KVM-v7.2.1-build0330-FORTINET.out.kvm.boot.qcow2",
             "version": "7.2.1",
@@ -35,6 +56,13 @@
             "filesize": 260506112,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FWB_KVM-v7.0.10-build0166-FORTINET.out.kvm_boot.qcow2",
+            "version": "7.0.10",
+            "md5sum": "ff9d4b827c4e41c1b38e59359ba05487",
+            "filesize": 257556992,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FWB_KVM-v7.0.6-build0140-FORTINET.out.kvm.boot.qcow2",
             "version": "7.0.6",
@@ -150,6 +178,27 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.6.0",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v7.6.0.F-build0962-FORTINET.out.kvm_boot.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.4.3",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v7.4.3-build0638-FORTINET.out.kvm_boot.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.2.8",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v7.2.8-build0400-FORTINET.out.kvm_boot.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.1",
             "images": {
@@ -157,6 +206,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.10",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v7.0.10-build0166-FORTINET.out.kvm_boot.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.6",
             "images": {

gns3server/appliances/freebsd.gns3a

@@ -24,13 +24,22 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "FreeBSD-14.0-RELEASE-amd64.qcow2",
+            "version": "14.0",
+            "md5sum": "87b988eaa4a8aaabea1c10649c98b3f0",
+            "filesize": 3506569216,
+            "download_url": "https://www.freebsd.org/where.html",
+            "direct_download_url": "https://download.freebsd.org/releases/VM-IMAGES/14.0-RELEASE/amd64/Latest/FreeBSD-14.0-RELEASE-amd64.qcow2.xz",
+            "compression": "xz"
+        },
         {
             "filename": "FreeBSD-13.0-RELEASE-amd64.qcow2",
             "version": "13.0",
             "md5sum": "e8e598959da456c03260421b5f9890de",
             "filesize": 3466854400,
             "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/13.0-RELEASE/amd64/Latest/FreeBSD-13.0-RELEASE-amd64.qcow2.xz",
+            "direct_download_url": "http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/VM-IMAGES/13.0-RELEASE/amd64/Latest/FreeBSD-13.0-RELEASE-amd64.qcow2.xz",
             "compression": "xz"
         },
         {
@@ -39,11 +48,17 @@
             "md5sum": "3d7d5396f3d89ed30c2bfa2ee2e6b013",
             "filesize": 3412000768,
             "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/12.3-RELEASE/amd64/Latest/FreeBSD-12.3-RELEASE-amd64.qcow2.xz",
+            "direct_download_url": "http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/VM-IMAGES/12.3-RELEASE/amd64/Latest/FreeBSD-12.3-RELEASE-amd64.qcow2.xz",
             "compression": "xz"
         }
     ],
     "versions": [
+        {
+            "name": "14.0",
+            "images": {
+                "hda_disk_image": "FreeBSD-14.0-RELEASE-amd64.qcow2"
+            }
+        },
         {
             "name": "13.0",
             "images": {

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": "developers@gns3.net",
+    "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"
+            }
+        }
+    ]
+}

gns3server/appliances/infix.gns3a

@@ -0,0 +1,104 @@
+{
+    "appliance_id": "4d351078-c6f5-444c-ab30-0ef20e3d8c53",
+    "name": "Infix",
+    "category": "router",
+    "description": "Infix is a Network Operating System based on Linux. It can be set up both as a switch, with offloading using switchdev, and a router with firewalling.",
+    "vendor_name": "KernelKit",
+    "vendor_url": "https://github.com/kernelkit",
+    "vendor_logo_url": "https://kernelkit.org/assets/img/jack.png",
+    "product_name": "Infix",
+    "registry_version": 4,
+    "documentation_url": "https://github.com/kernelkit/infix/tree/main/doc",
+    "status": "stable",
+    "availability": "free",
+    "maintainer": "KernelKit",
+    "maintainer_email": "kernelkit@googlegroups.com",
+    "usage": "Default login, user/pass: admin/admin\n\nType 'cli' (and Enter) followed by 'help' for an overview of commands and relevant configuration files.",
+    "port_name_format": "eth{0}",
+    "linked_clone": true,
+    "symbol": "router_red.svg",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 10,
+        "ram": 512,
+        "cpus": 1,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "process_priority": "normal",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "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"
+	},
+	{
+            "filename": "infix-x86_64-disk-24.11.1.img",
+            "filesize": 536870912,
+            "md5sum": "673a123fe122d1c2f5724baf9965a19d",
+            "version": "24.11.1",
+            "download_url": "https://github.com/kernelkit/infix/releases/download/v24.11.1/infix-x86_64-24.11.1.tar.gz",
+            "compression": "gzip"
+	},
+	{
+            "filename": "infix-x86_64-disk-25.01.0.img",
+            "filesize": 536870912,
+            "md5sum": "a814d93b385116b4a35712c445b5f830",
+            "version": "25.01.0",
+            "download_url": "https://github.com/kernelkit/infix/releases/download/v25.01.0/infix-x86_64-25.01.0.tar.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "infix-x86_64-disk-25.02.0.img",
+            "filesize": 536870912,
+            "md5sum": "8e29474c97df3486eb063a8af5043f50",
+            "version": "25.02.0",
+            "download_url": "https://github.com/kernelkit/infix/releases/download/v25.02.0/infix-x86_64-25.02.0.tar.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "infix-x86_64-disk-25.03.0.img",
+            "filesize": 536870912,
+            "md5sum": "5e1ed1081cd1673bfed4a9b5b1c58e08",
+            "version": "25.03.0",
+            "download_url": "https://github.com/kernelkit/infix/releases/download/v25.03.0/infix-x86_64-25.03.0.tar.gz",
+            "compression": "gzip"
+        }
+    ],
+    "versions": [
+	{
+            "name": "25.03.0",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "infix-x86_64-disk-25.03.0.img"
+            }
+        },
+	{
+            "name": "25.02.0",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "infix-x86_64-disk-25.02.0.img"
+            }
+        },
+        {
+            "name": "25.01.0",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "infix-x86_64-disk-25.01.0.img"
+            }
+        },
+        {
+            "name": "24.11.1",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "infix-x86_64-disk-24.11.1.img"
+            }
+        }
+    ]
+}

gns3server/appliances/innovaphone-app.gns3a

@@ -0,0 +1,50 @@
+{
+    "appliance_id": "92dbd0e9-144e-4c59-a4a8-97b6a1661818",
+    "name": "Innovaphone App-Platform",
+    "category": "guest",
+    "description": "In addition to telephony, apps for Video Telephony, Chat, Conferencing, Application Sharing and many other functions have become indispensable UCC tools in the area of business communication. Based on the myApps platform and its various components, innovaphone provides a collaborative work and communication platform for enhanced corporate communications \u2013 regardless of the location and the device being used. The innovaphone platform myApps consists of many independent components that work well individually, yet unfold their remarkable performance when combined.",
+    "vendor_name": "Innovaphone",
+    "vendor_url": "https://www.innovaphone.com",
+    "vendor_logo_url": "https://www.innovaphone.com/content/downloads/innovaphone-myapps-logo-short-without-background-screen.png",
+    "documentation_url": "https://wiki.innovaphone.com/index.php?title=Reference14r2:Concept_App_Platform",
+    "product_name": "App-Platform",
+    "product_url": "https://www.innovaphone.com/en/products/myapps/myapps-platform.html",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "free-to-try",
+    "maintainer": "Thomas Marchsteiner",
+    "maintainer_email": "thomas.marchsteiner@acp.at",
+    "usage": "Default users console:root/iplinux , ssh:admin/ipapps , Webinterface:pwd \nAfter first boot wait for automatic reboot.\nA static ip can be set via the setip utility. \nLoading another keymap can be done via the loadkeys command. \nThe app-platform-disk1.vmdk file is contained within an ova file. \nIt can be extraced with the tar utility, 7Zip or any other tool which can handle tar files.",
+    "symbol": "innovaphone-ap-icon.jpg",
+    "first_port_name": "eth0",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 1,
+        "ram": 512,
+        "cpus": 1,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "d",
+        "kvm": "allow",
+        "on_close": "power_off",
+        "process_priority": "normal"
+    },
+    "images": [
+        {
+            "filename": "app-platform-disk1_120010.vmdk",
+            "version": "12.0010",
+            "md5sum": "d5a5a77f682c2c988b0810935d79a787",
+            "filesize": 129474560,
+            "download_url": "https://store.innovaphone.com/"
+        }
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "app-platform-disk1_120010.vmdk"
+            },
+            "name": "12.0010"
+        }
+    ]
+}

gns3server/appliances/innovaphone-ipva.gns3a

@@ -0,0 +1,78 @@
+{
+    "appliance_id": "ddf8f7a4-60c0-4c9d-849c-ffc3c9d1d082",
+    "name": "Innovaphone IPVA",
+    "category": "guest",
+    "description": "The innovaphone PBX is a professional IP telephone system. The IPVA is a software-only solution. It appears as and performs as an innovaphone 'hard-box' excluding DSP-, ISDN-/AB-resources.",
+    "vendor_name": "Innovaphone",
+    "vendor_url": "https://www.innovaphone.com/",
+    "vendor_logo_url": "https://www.innovaphone.com/content/downloads/innovaphone-myapps-logo-short-without-background-screen.png",
+    "documentation_url": "https://wiki.innovaphone.com/index.php?title=Reference15r1:Concept_Innovaphone_Virtual_Appliance_(IPVA)",
+    "product_name": "IPVA",
+    "product_url": "https://www.innovaphone.com/en/products/innovaphone-pbx.html",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "free-to-try",
+    "maintainer": "Thomas Marchsteiner",
+    "maintainer_email": "thomas.marchsteiner@acp.at",
+    "usage": "Default user admin/ipva \nDefault network configuration: DHCP client on eth0 with fallback to static address 192.168.0.1/24 after timeout. Static address 192.168.1.1/24 on eth1\n The ova in the zip file contains the disk images to run this appliance. Disableing the dhcp client and setting a static IP is possible with the following commands:\n> config change IP0 ETH0 /addr 192.168.0.1 /mask 255.255.255.0 \n> config change DHCP0 /mode off \n> config write \n> config activate \n> reset",
+    "symbol": "innovaphone-pbx-green.png",
+    "first_port_name": "eth0",
+    "port_name_format": "eth{port1}",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 2,
+        "ram": 256,
+        "cpus": 1,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "ide",
+        "hdc_disk_interface": "ide",
+        "hdd_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "d",
+        "kvm": "allow",
+        "on_close": "power_off",
+        "process_priority": "normal"
+    },
+    "images": [
+        {
+            "filename": "ipva-qemu-disk1-14r2.vmdk",
+            "version": "14r2",
+            "md5sum": "aaa1c3885eee30ca6ffa3827619e8643",
+            "filesize": 6269952,
+            "download_url": "https://store.innovaphone.com/"
+        },
+        {
+            "filename": "ipva-qemu-disk2-14r2.vmdk",
+            "version": "14r2",
+            "md5sum": "008a8fc6b0b1e5f11a3e7fd6f22ba349",
+            "filesize": 72192,
+            "download_url": "https://store.innovaphone.com/"
+        },
+        {
+            "filename": "ipva-qemu-disk3-14r2.vmdk",
+            "version": "14r2",
+            "md5sum": "20516731c480e2112b3fb4a4d7f514f2",
+            "filesize": 68096,
+            "download_url": "https://store.innovaphone.com/"
+        },
+        {
+            "filename": "ipva-qemu-disk4-14r2.vmdk",
+            "version": "14r2",
+            "md5sum": "15d7d79ef8c28bd29b2eceac8405f964",
+            "filesize": 68096,
+            "download_url": "https://store.innovaphone.com/"
+        }
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "ipva-qemu-disk1-14r2.vmdk",
+                "hdb_disk_image": "ipva-qemu-disk2-14r2.vmdk",
+                "hdc_disk_image": "ipva-qemu-disk3-14r2.vmdk",
+                "hdd_disk_image": "ipva-qemu-disk4-14r2.vmdk"
+            },
+            "name": "14r2"
+        }
+    ]
+}

gns3server/appliances/juniper-junos-space.gns3a

@@ -12,18 +12,19 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "16 GB RAM is the bare minimum; you should use 32/64 GB in production deplyments.\nDefault credentials:\n- CLI: admin / abc123\n- WebUI: super / juniper123",
+    "usage": "16 GB RAM is the bare minimum; you should use 32/64 GB in production deployments.\nDefault credentials:\n- CLI: admin / abc123\n- WebUI: super / juniper123",
     "symbol": "juniper-vqfx.svg",
     "port_name_format": "em{0}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 4,
         "ram": 16384,
+        "cpus": 4,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-smp 4 -nographic"
+        "options": "-nographic -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {

gns3server/appliances/juniper-vJunos-router.gns3a

@@ -0,0 +1,75 @@
+{
+    "appliance_id": "12394e0d-9ac5-4da5-8e91-94a462536b61",
+    "name": "vJunos-router",
+    "category": "router",
+    "description": "vJunos-router",
+    "vendor_name": "Juniper",
+    "vendor_url": "https://www.juniper.net",
+    "documentation_url": "https://www.juniper.net/documentation/product/us/en/vjunos-router/",
+    "product_name": "vJunos Router",
+    "registry_version": 6,
+    "status": "stable",
+    "availability": "free",
+    "maintainer": "AAm-kun",
+    "maintainer_email": "github@sugarpapa.mozmail.com",
+    "usage": "GNS3 SHOULD be a baremetal installation. Using the GNS3 VM MIGHT result in unwanted issues. Default user is root. No password is needed.",
+    "symbol": "juniper-vmx.svg",
+    "first_port_name": "ge-0/0/0",
+    "port_name_format": "ge-0/0/{port0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 17,
+        "ram": 5120,
+        "cpus": 4,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require",
+        "options": "-serial mon:stdio -nographic -smbios type=1,product=VM-VMX,family=lab -cpu host",
+        "on_close": "power_off"
+    },
+    "images": [
+        {
+            "filename": "vJunos-router-24.2R1-S2.qcow2",
+            "version": "24.2R1-S2",
+            "md5sum": "dd906b4d19463e22f3e1a297ff1a7464",
+            "filesize": 3675783168,
+            "download_url": "https://support.juniper.net/support/downloads/?p=vjunos-router"
+        },
+        {
+            "filename": "vJunos-router-23.4R2-S2.1.qcow2",
+            "version": "23.4R2-S2.1",
+            "md5sum": "e25f5acdfc6c076d0023fd8289bcdd89",
+            "filesize": 3644063744,
+            "download_url": "https://support.juniper.net/support/downloads/?p=vjunos-router"
+        },
+        {
+            "filename": "vJunos-router-23.2R1.15.qcow2",
+            "version": "23.2R1.15",
+            "md5sum": "18670fb67633822697fdd3cf982e7eb1",
+            "filesize": 3653566464,
+            "download_url": "https://support.juniper.net/support/downloads/?p=vjunos-router"
+        }
+
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "vJunos-router-24.2R1-S2.qcow2"
+            },
+            "name": "24.2R1-S2"
+        },
+        {
+            "images": {
+                "hda_disk_image": "vJunos-router-23.4R2-S2.1.qcow2"
+            },
+            "name": "23.4R2-S2.1"
+        },
+        {
+            "images": {
+                "hda_disk_image": "vJunos-router-23.2R1.15.qcow2"
+            },
+            "name": "23.2R1.15"
+        }
+    ]
+}

gns3server/appliances/juniper-vmx-legacy.gns3a

@@ -34,7 +34,7 @@
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic"
+        "options": "-nographic -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {

gns3server/appliances/juniper-vmx-vcp.gns3a

@@ -26,7 +26,7 @@
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic -enable-kvm"
+        "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {

gns3server/appliances/juniper-vmx-vfp.gns3a

@@ -20,11 +20,12 @@
         "adapter_type": "virtio-net-pci",
         "adapters": 13,
         "ram": 4096,
+        "cpus": 4,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic -enable-kvm -smp cpus=3"
+        "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {

gns3server/appliances/juniper-vqfx-pfe.gns3a

@@ -23,7 +23,7 @@
         "arch": "x86_64",
         "console_type": "vnc",
         "kvm": "require",
-        "options": "-nographic"
+        "options": "-nographic -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {

gns3server/appliances/juniper-vqfx-re.gns3a

@@ -19,11 +19,12 @@
         "adapter_type": "virtio-net-pci",
         "adapters": 12,
         "ram": 1024,
+        "cpus": 2,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic -smp 2"
+        "options": "-nographic -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {

gns3server/appliances/juniper-vrr.gns3a

@@ -25,7 +25,7 @@
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic -enable-kvm"
+        "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {

gns3server/appliances/juniper-vsrx.gns3a

@@ -19,11 +19,12 @@
         "adapter_type": "vmxnet3",
         "adapters": 6,
         "ram": 4096,
+        "cpus": 2,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-smp 2"
+        "options": "-machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {

gns3server/appliances/mikrotik-chr.gns3a

@@ -28,140 +28,80 @@
     },
     "images": [
         {
-            "filename": "chr-7.11.2.img",
-            "version": "7.11.2",
-            "md5sum": "fbffd097d2c5df41fc3335c3977f782c",
+            "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.11.2/chr-7.11.2.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.16/chr-7.16.img.zip",
             "compression": "zip"
         },
         {
-            "filename": "chr-7.10.1.img",
-            "version": "7.10.1",
-            "md5sum": "917729e79b9992562f4160d461b21cac",
+            "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.10.1/chr-7.10.1.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.15.3/chr-7.15.3.img.zip",
             "compression": "zip"
         },
         {
-            "filename": "chr-7.7.img",
-            "version": "7.7",
-            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "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.7/chr-7.7.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.14.3/chr-7.14.3.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",
+            "name": "7.16",
             "images": {
-                "hda_disk_image": "chr-7.11.2.img"
+                "hda_disk_image": "chr-7.16.img"
             }
         },
         {
-            "name": "7.10.1",
+            "name": "7.15.3",
             "images": {
-                "hda_disk_image": "chr-7.10.1.img"
+                "hda_disk_image": "chr-7.15.3.img"
             }
         },
         {
-            "name": "7.7",
+            "name": "7.14.3",
             "images": {
-                "hda_disk_image": "chr-7.7.img"
+                "hda_disk_image": "chr-7.14.3.img"
             }
         },
         {
-            "name": "7.6",
+            "name": "6.49.17",
             "images": {
-                "hda_disk_image": "chr-7.6.img"
+                "hda_disk_image": "chr-6.49.17.img"
             }
         },
         {
-            "name": "7.3.1",
+            "name": "6.49.13",
             "images": {
-                "hda_disk_image": "chr-7.3.1.img"
-            }
-        },
-        {
-            "name": "7.1.5",
-            "images": {
-                "hda_disk_image": "chr-7.1.5.img"
-            }
-        },
-        {
-            "name": "6.49.10",
-            "images": {
-                "hda_disk_image": "chr-6.49.10.img"
-            }
-        },
-        {
-            "name": "6.49.6",
-            "images": {
-                "hda_disk_image": "chr-6.49.6.img"
-            }
-        },
-        {
-            "name": "6.48.6",
-            "images": {
-                "hda_disk_image": "chr-6.48.6.img"
+                "hda_disk_image": "chr-6.49.13.img"
             }
         }
     ]

gns3server/appliances/nethsecurity.gns3a

@@ -0,0 +1,44 @@
+{
+    "appliance_id": "bb9ff73a-701e-40e8-b68a-6a6efeb04e99",
+    "name": "NethSecurity",
+    "category": "firewall",
+    "description": "NethSecurity is an Unified Threat Management (UTM) solution that provides a comprehensive suite of security features, including firewall, content filtering, deep packet inspection (DPI) using Netifyd, Dedalo hotspot, OpenVPN, and an optional remote controller. It is designed to be easy to install and configure, making it a good choice for both small and medium-sized businesses (SMBs) as well as enterprise organizations.",
+    "vendor_name": "Nethesis",
+    "vendor_url": "https://www.nethesis.it/",
+    "documentation_url": "https://docs.nethsecurity.org/en/latest/",
+    "product_name": "NethSecurity",
+    "product_url": "https://nethsecurity.org/",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Ethernet0 is the LAN link, Ethernet1 the WAN link. The default username is root and the password is Nethesis,1234",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 2,
+        "ram": 1024,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "nethsecurity-8-24.10.0-ns.1.5.1-x86-64-generic-squashfs-combined-efi.img",
+            "version": "8-24.10.0-ns.1.5.1",
+            "md5sum": "be670218effca1b86dac6b8d95012791",
+            "filesize": 331644416,
+            "download_url": "https://nethsecurity.org/download",
+            "direct_download_url": "https://updates.nethsecurity.nethserver.org/stable/8-24.10.0-ns.1.5.1/targets/x86/64/nethsecurity-8-24.10.0-ns.1.5.1-x86-64-generic-squashfs-combined-efi.img.gz",
+            "compression": "gzip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "8-24.10.0-ns.1.5.1",
+            "images": {
+                "hda_disk_image": "nethsecurity-8-24.10.0-ns.1.5.1-x86-64-generic-squashfs-combined-efi.img"
+            }
+        }
+    ]
+}

gns3server/appliances/nixos.gns3a

@@ -0,0 +1,52 @@
+{
+    "appliance_id": "00714342-14b2-4281-aa20-9043ca8dc26e",
+    "name": "NixOS",
+    "category": "guest",
+    "description": "NixOS QEMU Appliance for images created with nixos-generator.  Automatically sets hostname based on vmname.",
+    "vendor_name": "NixOS",
+    "vendor_url": "https://nixos.org/",
+    "vendor_logo_url": "https://avatars.githubusercontent.com/u/487568",
+    "documentation_url": "https://github.com/ob7/gns3-nixos-appliance",
+    "product_name": "NixOS",
+    "product_url": "https://github.com/NixOS/nixpkgs",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "free",
+    "maintainer": "ob7dev",
+    "maintainer_email": "dev@ob7.us",
+    "usage": "For custom NixOS images, create qcow2 VM with: nixos-generate -f qcow -c ./server.nix   Import it into GNS3 as image.  VM name is passed into QEMU guest with Advanced Options field entry: -fw_cfg name=opt/vm_hostname,string=%vm-name%",
+    "symbol": ":/symbols/affinity/circle/gray/template.svg",
+    "first_port_name": "eth0",
+    "port_name_format": "eth{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 4,
+        "ram": 256,
+        "cpus": 1,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "allow",
+        "options": "-fw_cfg name=opt/vm_hostname,string=%vm-name%",
+        "on_close": "power_off"
+    },
+    "images": [
+      {
+        "filename": "nixos-24-11.qcow2",
+        "version": "24.11",
+        "md5sum": "2459f05136836dd430402d75cba0f205",
+        "download_url": "https://github.com/nix-community/nixos-generators",
+        "filesize": 1749483520,
+        "download_url": "https://f.ob7.us/gns3/",
+        "direct_download_url": "http://ob7.us/nixos-24-11.qcow2"
+      }
+    ],
+    "versions": [
+        {
+            "name": "24.11",
+            "images": {
+              "hda_disk_image": "nixos-24-11.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/open-media-vault.gns3a

@@ -26,6 +26,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "openmediavault_7.0.32-amd64.iso",
+            "version": "7.0.32",
+            "md5sum": "36d1fda7de0c8dd6806a65145845d362",
+            "filesize": 981467136,
+            "download_url": "https://www.openmediavault.org/download.html",
+            "direct_download_url": "https://sourceforge.net/projects/openmediavault/files/iso/7.0-32/openmediavault_7.0-32-amd64.iso"
+        },
         {
             "filename": "openmediavault_6.5.0-amd64.iso",
             "version": "6.5.0",
@@ -68,6 +76,14 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.0.32",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "openmediavault_7.0.32-amd64.iso"
+            }
+        },
         {
             "name": "6.5.0",
             "images": {

gns3server/appliances/openvswitch-management.gns3a

@@ -16,6 +16,6 @@
     "docker": {
         "adapters": 16,
         "image": "gns3/openvswitch:latest",
-        "environment": "MANAGEMENT_INTERFACE=1"
+        "environment": "MANAGEMENT_INTERFACE=eth0"
     }
 }

gns3server/appliances/opnsense.gns3a

@@ -25,6 +25,20 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "OPNsense-24.7-nano-amd64.img",
+            "version": "24.7",
+            "md5sum": "4f75dc2c948b907cbf73763b1539677c",
+            "filesize": 3221225472,
+            "download_url": "https://opnsense.c0urier.net/releases/24.7/"
+        },
+        {
+            "filename": "OPNsense-24.1-nano-amd64.img",
+            "version": "24.1",
+            "md5sum": "ea8472df2c272419b7834cddaf68048d",
+            "filesize": 3221225472,
+            "download_url": "https://opnsense.c0urier.net/releases/24.1/"
+        },
         {
             "filename": "OPNsense-23.1-OpenSSL-nano-amd64.img",
             "version": "23.1",
@@ -62,6 +76,18 @@
         }
     ],
     "versions": [
+        {
+            "name": "24.7",
+            "images": {
+                "hda_disk_image": "OPNsense-24.7-nano-amd64.img"
+            }
+        },
+        {
+            "name": "24.1",
+            "images": {
+                "hda_disk_image": "OPNsense-24.1-nano-amd64.img"
+            }
+        },
         {
             "name": "23.1",
             "images": {

gns3server/appliances/oracle-linux-cloud.gns3a

@@ -26,6 +26,14 @@
         "options": "-cpu host -nographic"
     },
     "images": [
+        {
+            "filename": "OL9U5_x86_64-kvm-b259.qcow2",
+            "version": "9.5",
+            "md5sum": "05e9b62c408ab49a02d6833fc683d1ad",
+            "filesize": 652935168,
+            "download_url": "https://yum.oracle.com/oracle-linux-templates.html",
+            "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL9/u5/x86_64/OL9U5_x86_64-kvm-b259.qcow2"
+        },
         {
             "filename": "OL9U2_x86_64-kvm-b197.qcow",
             "version": "9.2",
@@ -42,6 +50,14 @@
             "download_url": "https://yum.oracle.com/oracle-linux-templates.html",
             "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL9/u1/x86_64/OL9U1_x86_64-kvm-b158.qcow"
         },
+        {
+            "filename": "OL8U10_x86_64-kvm-b258.qcow2",
+            "version": "8.10",
+            "md5sum": "bb07581af5122515b6822595ded5deef",
+            "filesize": 1251672064,
+            "download_url": "https://yum.oracle.com/oracle-linux-templates.html",
+            "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL8/u10/x86_64/OL8U10_x86_64-kvm-b258.qcow2"
+        },
         {
             "filename": "OL8U8_x86_64-kvm-b198.qcow",
             "version": "8.8",
@@ -76,7 +92,14 @@
         }
     ],
     "versions": [
-{
+        {
+            "name": "9.5",
+            "images": {
+                "hda_disk_image": "OL9U5_x86_64-kvm-b259.qcow2",
+                "cdrom_image": "oracle-cloud-init-data.iso"
+            }
+        },
+        {
             "name": "9.2",
             "images": {
                 "hda_disk_image": "OL9U2_x86_64-kvm-b197.qcow",
@@ -90,6 +113,13 @@
                 "cdrom_image": "oracle-cloud-init-data.iso"
             }
         },
+        {
+            "name": "8.10",
+            "images": {
+                "hda_disk_image": "OL8U10_x86_64-kvm-b258.qcow2",
+                "cdrom_image": "oracle-cloud-init-data.iso"
+            }
+        },
         {
             "name": "8.8",
             "images": {

gns3server/appliances/pan-vm-fw.gns3a

@@ -28,6 +28,20 @@
     },
     "images": [
 		{
+            "filename": "PA-VM-KVM-11.0.0.qcow2",
+            "version": "11.0.0",
+            "md5sum": "fc54b0e680ca2bcecb5522430e420f06",
+            "filesize": 4130865152,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+        },
+		{
+            "filename": "PA-VM-KVM-10.2.3.qcow2",
+            "version": "10.2.3",
+            "md5sum": "0e7b2a52d1447186d335ef9a1a197c6c",
+            "filesize": 5298585600,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+        },
+		{
             "filename": "PA-VM-KVM-10.1.0.qcow2",
             "version": "10.1.0",
             "md5sum": "8266fd412a22694749f2cd4afcd5fa33",
@@ -128,6 +142,18 @@
     ],
     "versions": [
         {
+            "name": "11.0.0",
+            "images": {
+                "hda_disk_image": "PA-VM-KVM-11.0.0.qcow2"
+            }
+        },
+        {
+            "name": "10.2.3",
+            "images": {
+                "hda_disk_image": "PA-VM-KVM-10.2.3.qcow2"
+            }
+        },
+		{
             "name": "10.1.0",
             "images": {
                 "hda_disk_image": "PA-VM-KVM-10.1.0.qcow2"

gns3server/appliances/pfsense.gns3a

@@ -24,6 +24,13 @@
         "process_priority": "normal"
     },
     "images": [
+        {
+            "filename": "pfSense-CE-2.7.2-RELEASE-amd64.iso",
+            "version": "2.7.2",
+            "md5sum": "50c3e723d68ec74d038041a34fa846f8",
+            "filesize": 874672128,
+            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
+        },
         {
             "filename": "pfSense-CE-2.7.0-RELEASE-amd64.iso",
             "version": "2.7.0",
@@ -76,6 +83,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "2.7.2",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "pfSense-CE-2.7.2-RELEASE-amd64.iso"
+            }
+        },
         {
             "name": "2.7.0",
             "images": {

gns3server/appliances/reactos.gns3a

@@ -24,17 +24,17 @@
     },
     "images": [
         {
-            "filename": "ReactOS-0.4.14-release-15-gb6088a6.iso",
-            "version": "Installer-0.4.14-release-15",
-            "md5sum": "af4be6b27463446905f155f14232d2b4",
+            "filename": "ReactOS-0.4.14-release-21-g1302c1b.iso",
+            "version": "Installer-0.4.14-release-21",
+            "md5sum": "a30bc9143788c76ed584ffd5d25fddfe",
             "filesize": 140509184,
             "download_url": "https://reactos.org/download",
             "direct_download_url": "https://sourceforge.net/projects/reactos/files/ReactOS/0.4.14/ReactOS-0.4.14-release-21-g1302c1b-iso.zip/download"
         },
         {
-            "filename": "ReactOS-0.4.14-release-15-gb6088a6-Live.iso",
-            "version": "Live-0.4.14-release-15",
-            "md5sum": "73c1a0169a9a3b8a4feb91f4d00f5e97",
+            "filename": "ReactOS-0.4.14-release-21-g1302c1b-Live.iso",
+            "version": "Live-0.4.14-release-21",
+            "md5sum": "fc362820069adeea088b3a48dcfa3f9e",
             "filesize": 267386880,
             "download_url": "https://reactos.org/download",
             "direct_download_url": "https://sourceforge.net/projects/reactos/files/ReactOS/0.4.14/ReactOS-0.4.14-release-21-g1302c1b-live.zip/download"
@@ -50,17 +50,17 @@
     ],
     "versions": [
         {
-            "name": "Installer-0.4.14-release-15",
+            "name": "Installer-0.4.14-release-21",
             "images": {
                 "hda_disk_image": "empty30G.qcow2",
-                "cdrom_image": "ReactOS-0.4.14-release-15-gb6088a6.iso"
+                "cdrom_image": "ReactOS-0.4.14-release-21-g1302c1b.iso"
             }
         },
         {
-            "name": "Live-0.4.14-release-15",
+            "name": "Live-0.4.14-release-21",
             "images": {
                 "hda_disk_image": "empty30G.qcow2",
-                "cdrom_image": "ReactOS-0.4.14-release-15-gb6088a6-Live.iso"
+                "cdrom_image": "ReactOS-0.4.14-release-21-g1302c1b-Live.iso"
             }
         }
     ]

gns3server/appliances/rhel.gns3a

@@ -13,7 +13,7 @@
     "availability": "service-contract",
     "maintainer": "Da-Geek",
     "maintainer_email": "dageek@dageeks-geeks.gg",
-    "usage": "You should download Red Hat Enterprise Linux KVM Guest Image from https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.3/x86_64/product-software attach/customize rhel-cloud-init.iso and start.\nusername: cloud-user\npassword: redhat",
+    "usage": "You should download Red Hat Enterprise Linux KVM Guest Image from https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.5/x86_64/product-software attach/customize rhel-cloud-init.iso and start.\nusername: cloud-user\npassword: redhat",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 1,
@@ -26,6 +26,20 @@
         "options": "-cpu host -nographic"
     },
     "images": [
+        {
+            "filename": "rhel-9.5-x86_64-kvm.qcow2",
+            "version": "9.5",
+            "md5sum": "8174396d5cb47727c59dd04dd9a05418",
+            "filesize": 974389248,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.5/x86_64/product-software"
+        },
+        {
+            "filename": "rhel-9.4-x86_64-kvm.qcow2",
+            "version": "9.4",
+            "md5sum": "77a2ca9a4cb0448260e04f0d2ebf9807",
+            "filesize": 957218816,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.4/x86_64/product-software"
+        },
         {
             "filename": "rhel-9.3-x86_64-kvm.qcow2",
             "version": "9.3",
@@ -54,6 +68,20 @@
             "filesize": 696582144,
             "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/9.0/x86_64/product-software"
         },
+        {
+            "filename": "rhel-8.10-x86_64-kvm.qcow2",
+            "version": "8.10",
+            "md5sum": "5fda99fcab47e3b235c6ccdb6e80d362",
+            "filesize": 1065091072,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.10/x86_64/product-software"
+        },
+        {
+            "filename": "rhel-8.9-x86_64-kvm.qcow2",
+            "version": "8.9",
+            "md5sum": "23295fe508678cbdebfbdbd41ef6e6e2",
+            "filesize": 971833344,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.9/x86_64/product-software"
+        },
         {
             "filename": "rhel-8.8-x86_64-kvm.qcow2",
             "version": "8.8",
@@ -119,6 +147,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.5",
+            "images": {
+                "hda_disk_image": "rhel-9.5-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
+        {
+            "name": "9.4",
+            "images": {
+                "hda_disk_image": "rhel-9.4-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
         {
             "name": "9.3",
             "images": {
@@ -147,6 +189,20 @@
                 "cdrom_image": "rhel-cloud-init.iso"
             }
         },
+        {
+            "name": "8.10",
+            "images": {
+                "hda_disk_image": "rhel-8.10-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
+        {
+            "name": "8.9",
+            "images": {
+                "hda_disk_image": "rhel-8.9-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
         {
             "name": "8.8",
             "images": {

gns3server/appliances/rockylinux.gns3a

@@ -26,6 +26,14 @@
         "options": "-nographic -cpu host"
     },
     "images": [
+        {
+            "filename": "Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.qcow2",
+            "version": "9.5",
+            "md5sum": "880eccf788301bb9f34669faebe09276",
+            "filesize": 609812480,
+            "download_url": "https://download.rockylinux.org/pub/rocky/9/images/x86_64/",
+            "direct_download_url": "https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.qcow2"
+        },
         {
             "filename": "Rocky-9-GenericCloud-Base-9.3-20231113.0.x86_64.qcow2",
             "version": "9.3",
@@ -68,6 +76,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.5",
+            "images": {
+                "hda_disk_image": "Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.qcow2",
+                "cdrom_image": "rocky-cloud-init-data.iso"
+            }
+        },
         {
             "name": "9.3",
             "images": {

gns3server/appliances/security-onion.gns3a

@@ -13,18 +13,27 @@
     "status": "stable",
     "maintainer": "Brent Stewart",
     "maintainer_email": "brent@stewart.tc",
-    "usage": "Your default account will have sudo priviledges.  Squil and Squert username and password are configured in the Setup wizard.  MySQL root is set to null.  For more info see https://github.com/Security-Onion-Solutions/security-onion/wiki/Passwords.",
+    "usage": "Your default account will have sudo privileges. Squil and Squert username and password are configured in the Setup wizard.  MySQL root is set to null.  For more info see https://github.com/Security-Onion-Solutions/security-onion/wiki/Passwords.",
     "symbol": "securityonion-logo.png",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 2,
-        "ram": 3072,
+        "ram": 4096,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "vnc",
-        "kvm": "allow"
+        "kvm": "allow",
+        "options": "-cpu host"
     },
     "images": [
+        {
+            "filename": "securityonion-2.4.80-20240624.iso",
+            "version": "2.4.80-20240624",
+            "md5sum": "139f9762e926f9cb3c4a9528a3752c31",
+            "filesize": 12391022592,
+            "download_url": "https://github.com/Security-Onion-Solutions/securityonion/blob/2.4/main/DOWNLOAD_AND_VERIFY_ISO.md",
+            "direct_download_url": "https://download.securityonion.net/file/securityonion/securityonion-2.4.80-20240624.iso"
+        },
         {
             "filename": "securityonion-16.04.7.1.iso",
             "version": "16.04.7.1",
@@ -49,6 +58,14 @@
             "download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/",
             "direct_download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/download/v14.04.5.4_20171031/securityonion-14.04.5.4.iso"
         },
+        {
+            "filename": "empty100G.qcow2",
+            "version": "1.0",
+            "md5sum": "5d9fec18a980f13002028491259f158d",
+            "filesize": 198656,
+            "download_url": "https://github.com/riverbed/Riverbed-Community-Toolkit/raw/master/SteelHead/GNS3",
+            "direct_download_url": "https://github.com/riverbed/Riverbed-Community-Toolkit/raw/master/SteelHead/GNS3/empty100G.qcow2"
+        },
         {
             "filename": "empty30G.qcow2",
             "version": "1.0",
@@ -59,6 +76,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "2.4.80-20240624",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "securityonion-2.4.80-20240624.iso"
+            }
+        },
         {
             "name": "16.04.7.1",
             "images": {

gns3server/appliances/stormshield-eva.gns3a

@@ -0,0 +1,50 @@
+{
+    "appliance_id": "60801097-332e-4f40-a63e-8ad62047c01f",
+    "name": "Stormshield EVA",
+    "category": "firewall",
+    "description": "Stormshield EVA (Elastic Virtual Appliance) is a french virtual firewall designed to protect network infrastructures. It offers advanced features such as filtering, intrusion prevention (IPS), VPN management (IPSec/SSL), and access control.",
+    "vendor_name": "Stormshield",
+    "vendor_url": "https://www.stormshield.com/",
+    "vendor_logo_url": "https://www.stormshield.com/wp-content/uploads/stormshield-logo.png",
+    "documentation_url": "https://www.stormshield.com/fr/ressourcescenter/network-security-elastic-virtual-appliances/",
+    "product_name": "Stormshield EVA",
+    "product_url": "https://www.stormshield.com/fr/produits-et-services/produits/protection-des-reseaux/nos-produits/appliances-virtuelles/",
+    "registry_version": 4,
+    "status": "stable",
+    "availability": "service-contract",
+    "maintainer": "Samy SCANNA",
+    "maintainer_email": "samy.scanna@outlook.com",
+    "usage": "After the first boot, the appliance automatically runs the configuration script to set up the password, and network interfaces.",
+    "symbol": "stormshield.png",
+    "port_name_format": "port{port1}",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 8,
+        "ram": 2048,
+        "cpus": 1,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "allow",
+        "options": "-serial stdio",
+        "on_close": "shutdown_signal",
+        "process_priority": "normal"
+    },
+    "images": [
+        {
+            "filename": "utm-SNS-EVA-4.3.33-kvm.qcow2",
+            "version": "4.3.33",
+            "md5sum": "21d94d0e20f2e270f06c5853fd750d5b",
+            "filesize": 284360704,
+            "download_url": "https://mystormshield.eu/product/download/"
+        }
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "utm-SNS-EVA-4.3.33-kvm.qcow2"
+            },
+            "name": "4.3.33"
+        }
+    ]
+}

gns3server/appliances/truenas.gns3a

@@ -0,0 +1,104 @@
+{
+    "appliance_id": "8c19ccaa-a1d0-4473-94a2-a93b64924d88",
+    "name": "TrueNAS",
+    "category": "guest",
+    "description": "TrueNAS is a family of network-attached storage (NAS) products produced by iXsystems, incorporating both FOSS, as well as commercial offerings. Based on the OpenZFS file system, TrueNAS runs on FreeBSD as well as Linux and is available under the BSD License It is compatible with x86-64 hardware and is also available as turnkey appliances from iXsystems.",
+    "vendor_name": "iXsystems",
+    "vendor_url": "https://www.truenas.com/",
+    "documentation_url": "https://www.truenas.com/docs/",
+    "product_name": "TrueNAS",
+    "product_url": "https://www.truenas.com/",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "To install TrueNAS SCALE you may have to select the Legacy BIOS option.",
+    "port_name_format": "eth{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 1,
+        "ram": 8192,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "cd",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "TrueNAS-13.0-U6.2.iso",
+            "version": "CORE 13.0 U6.2",
+            "md5sum": "8b2882b53af5e9f3ca905c6acdee1690",
+            "filesize": 1049112576,
+            "download_url": "https://www.truenas.com/download-truenas-core/",
+            "direct_download_url": "https://download-core.sys.truenas.net/13.0/STABLE/U6.2/x64/TrueNAS-13.0-U6.2.iso"
+        },
+        {
+            "filename": "TrueNAS-13.3-RELEASE.iso",
+            "version": "CORE 13.3 RELEASE",
+            "md5sum": "8bb16cfb06f3f1374a27cf6aebb14ed3",
+            "filesize": 995567616,
+            "download_url": "https://www.truenas.com/download-truenas-core/",
+            "direct_download_url": "https://download-core.sys.truenas.net/13.3/STABLE/RELEASE/x64/TrueNAS-13.3-RELEASE.iso"
+        },
+        {
+            "filename": "TrueNAS-SCALE-24.04.2.2.iso",
+            "version": "SCALE 24.04.2.2",
+            "md5sum": "47d9026254a0775800bb2b8ab6d874fd",
+            "filesize": 1630355456,
+            "download_url": "https://www.truenas.com/download-truenas-scale/",
+            "direct_download_url": "https://download.sys.truenas.net/TrueNAS-SCALE-Dragonfish/24.04.2.2/TrueNAS-SCALE-24.04.2.2.iso"
+        },
+        {
+            "filename": "TrueNAS-SCALE-24.10-BETA.1.iso",
+            "version": "SCALE 24.10-BETA.1",
+            "md5sum": "cc3d5758d1db3d55ae9c8716f5d43b88",
+            "filesize": 1491378176,
+            "download_url": "https://www.truenas.com/download-truenas-scale/",
+            "direct_download_url": "https://download.sys.truenas.net/TrueNAS-SCALE-ElectricEel-BETA/24.10-BETA.1/TrueNAS-SCALE-24.10-BETA.1.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"
+        }
+    ],
+    "versions": [
+        {
+            "name": "CORE 13.0 U6.2",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "TrueNAS-13.0-U6.2.iso"
+            }
+        },
+        {
+            "name": "CORE 13.3 RELEASE",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "TrueNAS-13.3-RELEASE.iso"
+            }
+        },
+        {
+            "name": "SCALE 24.04.2.2",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "TrueNAS-SCALE-24.04.2.2.iso"
+            }
+        },
+        {
+            "name": "SCALE 24.10-BETA.1",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "TrueNAS-SCALE-24.10-BETA.1.iso"
+            }
+        }
+    ]
+}

gns3server/appliances/ubuntu-cloud.gns3a

@@ -28,36 +28,44 @@
     },
     "images": [
         {
-            "filename": "ubuntu-23.04-server-cloudimg-amd64.img",
-            "version": "Ubuntu 23.04 (Lunar Lobster)",
-            "md5sum": "369e3b1f68416c39245a8014172406dd",
-            "filesize": 756678656,
-            "download_url": "https://cloud-images.ubuntu.com/releases/23.04/release/",
-            "direct_download_url": "https://cloud-images.ubuntu.com/releases/23.04/release/ubuntu-23.04-server-cloudimg-amd64.img"
+            "filename": "ubuntu-24.10-server-cloudimg-amd64.img",
+            "version": "Ubuntu 24.10 (Oracular Oriole)",
+            "md5sum": "f2960f8743efedd0a4968bfcd9451782",
+            "filesize": 627360256,
+            "download_url": "https://cloud-images.ubuntu.com/releases/oracular/release-20241009/",
+            "direct_download_url": "https://cloud-images.ubuntu.com/releases/oracular/release-20241009/ubuntu-24.10-server-cloudimg-amd64.img"
+        },
+        {
+            "filename": "ubuntu-24.04-server-cloudimg-amd64.img",
+            "version": "Ubuntu 24.04 LTS (Noble Numbat)",
+            "md5sum": "a1c8a01953578ad432cbef03db2f3161",
+            "filesize": 587241984,
+            "download_url": "https://cloud-images.ubuntu.com/releases/noble/release-20241004/",
+            "direct_download_url": "https://cloud-images.ubuntu.com/releases/noble/release-20241004/ubuntu-24.04-server-cloudimg-amd64.img"
         },
         {
             "filename": "ubuntu-22.04-server-cloudimg-amd64.img",
             "version": "Ubuntu 22.04 LTS (Jammy Jellyfish)",
-            "md5sum": "3ce0b84f9592482fb645e8253b979827",
-            "filesize": 686096384,
-            "download_url": "https://cloud-images.ubuntu.com/releases/jammy/release",
-            "direct_download_url": "https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img"
+            "md5sum": "8f9a70435dc5b0b86cf5d0d4716b6091",
+            "filesize": 653668352,
+            "download_url": "https://cloud-images.ubuntu.com/releases/jammy/release-20241002/",
+            "direct_download_url": "https://cloud-images.ubuntu.com/releases/jammy/release-20241002/ubuntu-22.04-server-cloudimg-amd64.img"
         },
         {
             "filename": "ubuntu-20.04-server-cloudimg-amd64.img",
             "version": "Ubuntu 20.04 LTS (Focal Fossa)",
-            "md5sum": "044bc979b2238192ee3edb44e2bb6405",
-            "filesize": 552337408,
-            "download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20210119.1/",
-            "direct_download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20210119.1/ubuntu-20.04-server-cloudimg-amd64.img"
+            "md5sum": "1dff90e16acb0167c27ff82e4ac1813a",
+            "filesize": 627310592,
+            "download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20240821/",
+            "direct_download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20240821/ubuntu-20.04-server-cloudimg-amd64.img"
         },
         {
             "filename": "ubuntu-18.04-server-cloudimg-amd64.img",
             "version": "Ubuntu 18.04 LTS (Bionic Beaver)",
-            "md5sum": "f4134e7fa16d7fa766c7467cbe25c949",
-            "filesize": 336134144,
-            "download_url": "https://cloud-images.ubuntu.com/releases/18.04/release-20180426.2/",
-            "direct_download_url": "https://cloud-images.ubuntu.com/releases/18.04/release-20180426.2/ubuntu-18.04-server-cloudimg-amd64.img"
+            "md5sum": "62fa110eeb0459c1ff166f897aeb9f78",
+            "filesize": 405667840,
+            "download_url": "https://cloud-images.ubuntu.com/releases/bionic/release-20230607/",
+            "direct_download_url": "https://cloud-images.ubuntu.com/releases/bionic/release-20230607/ubuntu-18.04-server-cloudimg-amd64.img"
         },
         {
             "filename": "ubuntu-cloud-init-data.iso",
@@ -70,9 +78,16 @@
     ],
     "versions": [
         {
-            "name": "Ubuntu 23.04 (Lunar Lobster)",
+            "name": "Ubuntu 24.10 (Oracular Oriole)",
             "images": {
-                "hda_disk_image": "ubuntu-23.04-server-cloudimg-amd64.img",
+                "hda_disk_image": "ubuntu-24.10-server-cloudimg-amd64.img",
+                "cdrom_image": "ubuntu-cloud-init-data.iso"
+            }
+        },
+        {
+            "name": "Ubuntu 24.04 LTS (Noble Numbat)",
+            "images": {
+                "hda_disk_image": "ubuntu-24.04-server-cloudimg-amd64.img",
                 "cdrom_image": "ubuntu-cloud-init-data.iso"
             }
         },

gns3server/appliances/ubuntu-docker.gns3a

@@ -14,7 +14,7 @@
     "symbol": "linux_guest.svg",
     "docker": {
         "adapters": 1,
-        "image": "gns3/ubuntu:focal",
+        "image": "gns3/ubuntu:noble",
         "console_type": "telnet"
     }
 }

gns3server/appliances/ubuntu-gui.gns3a

@@ -27,6 +27,13 @@
         "options": "-vga qxl"
     },
     "images": [
+        {
+            "filename": "Ubuntu 24.04 (64bit).vmdk",
+            "version": "24.04",
+            "md5sum": "7709a5a1cf888c7644d245c42d217918",
+            "filesize": 6432555008,
+            "download_url": "https://www.osboxes.org/ubuntu/"
+        },
         {
             "filename": "Ubuntu 22.04 (64bit).vmdk",
             "version": "22.04",
@@ -57,6 +64,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "24.04",
+            "images": {
+                "hda_disk_image": "Ubuntu 24.04 (64bit).vmdk"
+            }
+        },
         {
             "name": "22.04",
             "images": {

gns3server/appliances/viptela-edge-genericx86-64.gns3a

@@ -10,8 +10,8 @@
     "product_url": "http://www.cisco.com/",
     "registry_version": 4,
     "status": "experimental",
-    "maintainer": "Laurent LEVIER",
-    "maintainer_email": "laurent.levier@orange.com",
+    "maintainer": "Christopher Uhrig",
+    "maintainer_email": "christopher.uhrig@telekom.de",
     "usage": "Initial username is admin, password is admin as well.",
     "first_port_name": "Management0/0",
     "port_name_format": "Ge0/{0}",
@@ -39,6 +39,20 @@
             "md5sum": "4aa487101d4cdc390f53a6e8b6f45ca7",
             "filesize": 328400896,
             "download_url": "http://www.cisco.com/"
+        },
+		{
+            "filename": "viptela-edge-20.9.5.1-genericx86-64.qcow2",
+            "version": "20.9.5.1",
+            "md5sum": "41d9e981908fd83695de78d6ca5794bd",
+            "filesize": 409468928,
+            "download_url": "https://software.cisco.com/download/home/286320995/type/286321047/release/20.9.5.1"
+        },
+	{
+            "filename": "viptela-edge-20.12.4-genericx86-64.qcow2",
+            "version": "20.12.4",
+            "md5sum": "9f1aedada5e632c7bc29a51c004f4486",
+            "filesize": 411762688,
+            "download_url": "https://software.cisco.com/download/home/286320995/type/286321047/release/20.12.4"
         }
     ],
     "versions": [
@@ -53,6 +67,18 @@
             "images": {
                 "hda_disk_image": "viptela-edge-genericx86-64.qcow2"
             }
+        },
+		{
+            "name": "20.9.5.1",
+            "images": {
+                "hda_disk_image": "viptela-edge-20.9.5.1-genericx86-64.qcow2"
+            }
+        },
+  	{
+            "name": "20.12.4",
+            "images": {
+                "hda_disk_image": "viptela-edge-20.12.4-genericx86-64.qcow2"
+            }
         }
     ]
 }

gns3server/appliances/viptela-smart-genericx86-64.gns3a

@@ -24,6 +24,20 @@
         "options": "-smp 2,maxcpus=2 -cpu host"
     },
     "images": [
+		{
+            "filename": "viptela-smart-20.12.4-genericx86-64.qcow2",
+            "version": "20.12.4",
+            "md5sum": "0e7b6468498a89195ab815260bc4cfb6",
+            "filesize": 411762688,
+            "download_url": "https://software.cisco.com/download/home/286320995/type/286321043/release/20.12.4"
+        },
+		{
+            "filename": "viptela-smart-20.9.5.1-genericx86-64.qcow2",
+            "version": "20.9.5.1",
+            "md5sum": "08e105778bb68f8f24f323dfd263a91a",
+            "filesize": 409468928,
+            "download_url": "https://software.cisco.com/download/home/286320995/type/286321043/release/20.9.5.1"
+        },
         {
             "filename": "viptela-smart-19.2.0-genericx86-64.qcow2",
             "version": "19.2.0",
@@ -31,7 +45,7 @@
             "filesize": 328400896,
             "download_url": "http://www.cisco.com/"
         },
-        {
+ 	    {
             "filename": "viptela-smart-genericx86-64-disk1.vmdk",
             "version": "18.3.7",
             "md5sum": "ab9b06c212319336810a4b336ec3dd96",
@@ -51,6 +65,18 @@
             "images": {
                 "hda_disk_image": "viptela-smart-19.2.0-genericx86-64.qcow2"
             }
+        },
+		{
+            "name": "20.9.5.1",
+            "images": {
+                "hda_disk_image": "viptela-smart-20.9.5.1-genericx86-64.qcow2"
+            }
+        },
+		{
+            "name": "20.12.4",
+            "images": {
+                "hda_disk_image": "viptela-smart-20.12.4-genericx86-64.qcow2"
+            }
         }
     ]
 }

gns3server/appliances/viptela-vmanage-genericx86-64.gns3a

@@ -10,8 +10,8 @@
     "product_url": "http://www.cisco.com/",
     "registry_version": 4,
     "status": "experimental",
-    "maintainer": "Laurent LEVIER",
-    "maintainer_email": "laurent.levier@orange.com",
+    "maintainer": "Christopher Uhrig",
+    "maintainer_email": "christopher.uhrig@telekom.de",
     "usage": "Initial username is admin, password is admin as well.",
     "qemu": {
         "adapter_type": "vmxnet3",
@@ -25,14 +25,28 @@
         "options": "-cpu host -smp 2,maxcpus=2"
     },
     "images": [
-        {
+		{
+            "filename": "viptela-vmanage-20.12.4-genericx86-64.qcow2",
+            "version": "20.12.4",
+            "md5sum": "4e0d4c379623c495a0bb671a76a12f9f",
+            "filesize": 4951375872,
+            "download_url": "https://software.cisco.com/download/home/286320995/type/286321039/release/20.12.4"
+        },
+		{
+            "filename": "viptela-vmanage-20.9.5.2-genericx86-64.qcow2",
+            "version": "20.9.5.2",
+            "md5sum": "a8a4ebee0274541200f4fe94a739d454",
+            "filesize": 3133865984,
+            "download_url": "https://software.cisco.com/download/home/286320995/type/286321039/release/20.9.5.2"
+        },
+		{
             "filename": "viptela-vmanage-19.2.0-genericx86-64.qcow2",
             "version": "19.2.0",
             "md5sum": "27ef126f178c6c929a36ad2cf6ed8db7",
             "filesize": 1185349632,
             "download_url": "http://www.cisco.com/"
         },
-        {
+		{
             "filename": "viptela-vmanage-genericx86-64-disk1.vmdk",
             "version": "18.3.7",
             "md5sum": "2290c6467c907d9ca9c65793fe898716",
@@ -55,6 +69,20 @@
                 "hda_disk_image": "viptela-vmanage-19.2.0-genericx86-64.qcow2",
                 "hdb_disk_image": "empty30G.qcow2"
             }
+        },
+		{
+            "name": "20.12.4",
+            "images": {
+                "hda_disk_image": "viptela-vmanage-20.12.4-genericx86-64.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+		{
+            "name": "20.9.5.2",
+            "images": {
+                "hda_disk_image": "viptela-vmanage-20.9.5.2-genericx86-64.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
         },
         {
             "name": "18.3.7",

gns3server/appliances/vyos.gns3a

@@ -1,181 +1,191 @@
 {
     "appliance_id": "f82b74c4-0f30-456f-a582-63daca528502",
-    "name": "VyOS",
+    "name": "VyOS Universal Router",
     "category": "router",
-    "description": "VyOS is a community fork of Vyatta, a Linux-based network operating system that provides software-based network routing, firewall, and VPN functionality.",
-    "vendor_name": "Linux",
-    "vendor_url": "https://vyos.net/",
+    "description": "VyOS is an open-source network operating system that provides a comprehensive suite of features for routing, firewalling, and VPN functionality. VyOS offers a robust and flexible solution for both small-scale and large-scale network environments. It is designed to support enterprise-grade networking with the added benefits of community-driven development and continuous updates.\n\nThe VyOS Universal Router, when used in GNS3, brings the power and versatility of VyOS to network simulation and emulation. GNS3 users can deploy the VyOS Universal Router to create and test complex network topologies in a virtual environment. This appliance provides a rich set of features, including dynamic routing protocols, stateful firewall capabilities, various VPNs, as well as high availability configurations.\n\nThe seamless integration with GNS3 allows network engineers and architects to validate network designs, perform testing and troubleshooting, and enhance their skill sets in a controlled, risk-free environment.",
+    "vendor_name": "VyOS Inc.",
+    "vendor_url": "https://vyos.io/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/VyOS.png",
     "documentation_url": "https://docs.vyos.io/",
-    "product_name": "VyOS",
-    "product_url": "https://vyos.net/",
+    "product_name": "VyOS Universal Router",
+    "product_url": "https://vyos.io/vyos-universal-router",
     "registry_version": 4,
     "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
-    "usage": "Default username/password is vyos/vyos.\n\nThe -KVM versions are ready to use, no installation is required.\nThe other images will start the router from the CDROM on initial boot. Login and then type \"install image\" and follow the instructions.",
+    "availability": "service-contract",
+    "maintainer": "VyOS Inc.",
+    "maintainer_email": "support@vyos.io",
+    "usage": "\nDefault credentials:\nUser: vyos\nPassword: vyos",
     "symbol": "vyos.svg",
     "port_name_format": "eth{0}",
     "qemu": {
-        "adapter_type": "e1000",
-        "adapters": 3,
-        "ram": 512,
-        "hda_disk_interface": "scsi",
+        "adapter_type": "virtio-net-pci",
+        "adapters": 10,
+        "ram": 2048,
+        "cpus": 4,
+        "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "telnet",
-        "boot_priority": "cd",
-        "kvm": "allow"
+        "boot_priority": "c",
+        "kvm": "require",
+        "on_close": "shutdown_signal"
     },
     "images": [
         {
-            "filename": "vyos-1.3.2-amd64.iso",
+            "filename": "vyos-1.4.1-kvm-amd64.qcow2",
+            "version": "1.4.1",
+            "md5sum": "5b8ebcd9905719d24405ed093afdd8ba",
+            "filesize": 513736704,
+            "download_url": "https://support.vyos.io/"
+        },
+        {
+            "filename": "vyos-1.4.0-kvm-amd64.qcow2",
+            "version": "1.4.0",
+            "md5sum": "a130e446bc5bf87391981f183ee3694b",
+            "filesize": 468320256,
+            "download_url": "https://support.vyos.io/"
+        },
+        {
+            "filename": "vyos-1.3.7-qemu-amd64.qcow2",
+            "version": "1.3.7",
+            "md5sum": "f4663b1e2df115bfa5c7ec17584514d6",
+            "filesize": 359792640,
+            "download_url": "https://support.vyos.io/"
+        },
+        {
+            "filename": "vyos-1.3.2-10G-qemu.qcow2",
             "version": "1.3.2",
-            "md5sum": "070743faac800f9e5197058a8b6b3ba1",
-            "filesize": 334495744,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-3-2-generic-iso-image"
+            "md5sum": "68ad3fb530213189ac9ed496d5fe7897",
+            "filesize": 326893568,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.3.1-S1-amd64.iso",
+            "filename": "vyos-1.3.1-S1-10G-qemu.qcow2",
             "version": "1.3.1-S1",
-            "md5sum": "781f345e8a4ab9eb9e075ce5c87c8817",
-            "filesize": 351272960,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-3-1-s1-generic-iso-image"
+            "md5sum": "d8ed9f82a983295b94b07f8e37c48ed0",
+            "filesize": 343801856,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.3.1-amd64.iso",
+            "filename": "vyos-1.3.1-10G-qemu.qcow2",
             "version": "1.3.1",
-            "md5sum": "b6f57bd0cf9b60cdafa337b08ba4f2bc",
-            "filesize": 350224384,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-3-1-generic-iso-image"
+            "md5sum": "482367c833990fb2b9350e3708d33dc9",
+            "filesize": 342556672,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.3.0-amd64.iso",
+            "filename": "vyos-1.3.0-10G-qemu.qcow2",
             "version": "1.3.0",
-            "md5sum": "2019bd9c5efa6194e2761de678d0073f",
-            "filesize": 338690048,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-3-0-generic-iso-image"
-        },
-        {
-            "filename": "vyos-1.2.9-S1-amd64.iso",
-            "version": "1.2.9-S1",
-            "md5sum": "3fece6363f9766f862e26d292d0ed5a3",
-            "filesize": 430964736,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-s1-generic-iso-image",
-            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9-S1/vyos-1.2.9-S1-amd64.iso"
+            "md5sum": "086e95e992e9b4d014c5f154cd01a6e6",
+            "filesize": 330956800,
+            "download_url": "https://support.vyos.io/"
         },
         {
             "filename": "vyos-1.2.9-S1-10G-qemu.qcow2",
-            "version": "1.2.9-S1-KVM",
+            "version": "1.2.9-S1",
             "md5sum": "0a70d78b80a3716d42487c02ef44f41f",
             "filesize": 426967040,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-s1-for-kvm",
-            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9-S1/vyos-1.2.9-S1-10G-qemu.qcow2"
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.2.9-amd64.iso",
-            "version": "1.2.9",
-            "md5sum": "586be23b6256173e174c82d8f1f699a1",
-            "filesize": 430964736,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-generic-iso-image",
-            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9/vyos-1.2.9-amd64.iso"
-        },
-        {
-            "filename": "vyos-1.2.9-10G-qemu.qcow2",
-            "version": "1.2.9-KVM",
-            "md5sum": "76871c7b248c32f75177c419128257ac",
-            "filesize": 427360256,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-10g-qemu-qcow2",
-            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9/vyos-1.2.9-10G-qemu.qcow2"
-        },
-        {
-            "filename": "vyos-1.2.8-amd64.iso",
+            "filename": "vyos-1.2.8-10G-qemu.qcow2",
             "version": "1.2.8",
-            "md5sum": "0ad879db903efdbf1c39dc945e165931",
-            "filesize": 429916160,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-8-generic-iso-image"
+            "md5sum": "96c76f619d0f8ea11dc8a3a18ed67b98",
+            "filesize": 425852928,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.1.8-amd64.iso",
-            "version": "1.1.8",
-            "md5sum": "95a141d4b592b81c803cdf7e9b11d8ea",
-            "filesize": 241172480,
-            "direct_download_url": "https://legacy-lts-images.vyos.io/vyos-1.1.8-amd64.iso"
+            "filename": "vyos-1.2.7-qemu.qcow2",
+            "version": "1.2.7",
+            "md5sum": "1be4674c970fcdd65067e504baea5d74",
+            "filesize": 424607744,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "empty8G.qcow2",
-            "version": "1.0",
-            "md5sum": "f1d2c25b6990f99bd05b433ab603bdb4",
-            "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/empty8G.qcow2/download"
+            "filename": "vyos-1.2.6-qemu.qcow2",
+            "version": "1.2.6",
+            "md5sum": "d8010d79889ca0ba5cb2634665e548e3",
+            "filesize": 424607744,
+            "download_url": "https://support.vyos.io/"
+        },
+        {
+            "filename": "vyos-1.2.5-amd64.qcow2",
+            "version": "1.2.5",
+            "md5sum": "110c22309ec480600446fd2fb4f27a0d",
+            "filesize": 411500544 ,
+            "download_url": "https://support.vyos.io/"
         }
     ],
     "versions": [
+        {
+            "name": "1.4.1",
+            "images": {
+                "hda_disk_image": "vyos-1.4.1-kvm-amd64.qcow2"
+            }
+        },
+        {
+            "name": "1.4.0",
+            "images": {
+                "hda_disk_image": "vyos-1.4.0-kvm-amd64.qcow2"
+            }
+        },
+        {
+            "name": "1.3.7",
+            "images": {
+                "hda_disk_image": "vyos-1.3.7-qemu-amd64.qcow2"
+            }
+        },
         {
             "name": "1.3.2",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.3.2-amd64.iso"
+                "hda_disk_image": "vyos-1.3.2-10G-qemu.qcow2"
             }
         },
         {
             "name": "1.3.1-S1",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.3.1-S1-amd64.iso"
+                "hda_disk_image": "vyos-1.3.1-S1-10G-qemu.qcow2"
             }
         },
         {
             "name": "1.3.1",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.3.1-amd64.iso"
+                "hda_disk_image": "vyos-1.3.1-10G-qemu.qcow2"
             }
         },
         {
             "name": "1.3.0",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.3.0-amd64.iso"
+                "hda_disk_image": "vyos-1.3.0-10G-qemu.qcow2"
             }
         },
         {
             "name": "1.2.9-S1",
-            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.2.9-S1-amd64.iso"
-            }
-        },
-        {
-            "name": "1.2.9-S1-KVM",
             "images": {
                 "hda_disk_image": "vyos-1.2.9-S1-10G-qemu.qcow2"
             }
         },
-        {
-            "name": "1.2.9",
-            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.2.9-amd64.iso"
-            }
-        },
-        {
-            "name": "1.2.9-KVM",
-            "images": {
-                "hda_disk_image": "vyos-1.2.9-10G-qemu.qcow2"
-            }
-        },
         {
             "name": "1.2.8",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.2.8-amd64.iso"
+                "hda_disk_image": "vyos-1.2.8-10G-qemu.qcow2"
             }
         },
         {
-            "name": "1.1.8",
+            "name": "1.2.7",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.1.8-amd64.iso"
+                "hda_disk_image": "vyos-1.2.7-qemu.qcow2"
+            }
+        },
+        {
+            "name": "1.2.6",
+            "images": {
+                "hda_disk_image": "vyos-1.2.6-qemu.qcow2"
+            }
+        },
+        {
+            "name": "1.2.5",
+            "images": {
+                "hda_disk_image": "vyos-1.2.5-amd64.qcow2"
             }
         }
     ]

gns3server/compute/base_node.py

@@ -406,13 +406,11 @@ class BaseNode:
         Stops the telnet proxy.
         """
 
-        if self._wrapper_telnet_server:
+        if self._wrap_console_writer:
             self._wrap_console_writer.close()
-            if sys.version_info >= (3, 7, 0):
-                try:
-                    await self._wrap_console_writer.wait_closed()
-                except ConnectionResetError:
-                    pass
+            await self._wrap_console_writer.wait_closed()
+            self._wrap_console_writer = None
+        if self._wrapper_telnet_server:
             self._wrapper_telnet_server.close()
             await self._wrapper_telnet_server.wait_closed()
             self._wrapper_telnet_server = None
@@ -662,6 +660,7 @@ class BaseNode:
         path = shutil.which(path)
         return path
 
+    @locking
     async def _ubridge_send(self, command):
         """
         Sends a command to uBridge hypervisor.

gns3server/compute/docker/__init__.py

@@ -29,6 +29,7 @@ import shutil
 import platformdirs
 
 from gns3server.utils import parse_version
+from gns3server.config import Config
 from gns3server.utils.asyncio import locking
 from gns3server.compute.base_manager import BaseManager
 from gns3server.compute.docker.docker_vm import DockerVM
@@ -88,7 +89,7 @@ class Docker(BaseManager):
                                     f"{stdout.decode('utf-8', errors='ignore').strip()}")
                 except OSError as e:
                     raise DockerError(f"Could not install busybox: {e}")
-        raise DockerError("No busybox executable could be found")
+        raise DockerError("No busybox executable could be found, please install busybox (apt install busybox-static on Debian/Ubuntu) and make sure it is in your PATH")
 
     @staticmethod
     def resources_path():
@@ -96,8 +97,10 @@ class Docker(BaseManager):
         Get the Docker resources storage directory
         """
 
+        server_config = Config.instance().get_section_config("Server")
         appname = vendor = "GNS3"
-        docker_resources_dir = os.path.join(platformdirs.user_data_dir(appname, vendor, roaming=True), "docker", "resources")
+        resources_path = os.path.expanduser(server_config.get("resources_path", platformdirs.user_data_dir(appname, vendor, roaming=True)))
+        docker_resources_dir = os.path.join(resources_path, "docker")
         os.makedirs(docker_resources_dir, exist_ok=True)
         return docker_resources_dir
 
@@ -170,11 +173,10 @@ class Docker(BaseManager):
         response = await self.http_query(method, path, data=data, params=params)
         body = await response.read()
         response.close()
-        if body and len(body):
-            if response.headers.get('CONTENT-TYPE') == 'application/json':
-                body = json.loads(body.decode("utf-8"))
-            else:
-                body = body.decode("utf-8")
+        if response.headers.get('CONTENT-TYPE') == 'application/json':
+            body = json.loads(body.decode("utf-8", errors="ignore"))
+        else:
+            body = body.decode("utf-8", errors="ignore")
         log.debug("Query Docker %s %s params=%s data=%s Response: %s", method, path, params, data, body)
         return body
 
@@ -258,21 +260,21 @@ class Docker(BaseManager):
             pass
 
         if progress_callback:
-            progress_callback("Pulling '{}' from docker hub".format(image))
+            progress_callback("Pulling '{}' from Docker repository".format(image))
         try:
             response = await self.http_query("POST", "images/create", params={"fromImage": image}, timeout=None)
         except DockerError as e:
-            raise DockerError("Could not pull the '{}' image from Docker Hub, please check your Internet connection (original error: {})".format(image, e))
+            raise DockerError("Could not pull the '{}' image from Docker repository, please check your Internet connection (original error: {})".format(image, e))
         # The pull api will stream status via an HTTP JSON stream
         content = ""
         while True:
             try:
                 chunk = await response.content.read(CHUNK_SIZE)
             except aiohttp.ServerDisconnectedError:
-                log.error("Disconnected from server while pulling Docker image '{}' from docker hub".format(image))
+                log.error("Disconnected from server while pulling Docker image '{}' from Docker repository".format(image))
                 break
             except asyncio.TimeoutError:
-                log.error("Timeout while pulling Docker image '{}' from docker hub".format(image))
+                log.error("Timeout while pulling Docker image '{}' from Docker repository".format(image))
                 break
             if not chunk:
                 break

gns3server/compute/docker/docker_vm.py

@@ -33,7 +33,7 @@ from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer
 from gns3server.utils.asyncio.raw_command_server import AsyncioRawCommandServer
 from gns3server.utils.asyncio import wait_for_file_creation
 from gns3server.utils.asyncio import monitor_process
-from gns3server.utils.get_resource import get_resource
+from gns3server.utils import macaddress_to_int, int_to_macaddress
 
 from gns3server.ubridge.ubridge_error import UbridgeError, UbridgeNamespaceError
 from ..base_node import BaseNode
@@ -83,6 +83,7 @@ class DockerVM(BaseNode):
         self._environment = environment
         self._cid = None
         self._ethernet_adapters = []
+        self._mac_address = ""
         self._temporary_directory = None
         self._telnet_servers = []
         self._vnc_process = None
@@ -106,6 +107,8 @@ class DockerVM(BaseNode):
         else:
             self.adapters = adapters
 
+        self.mac_address = ""  # this will generate a MAC address
+
         log.debug("{module}: {name} [{image}] initialized.".format(module=self.manager.module_name,
                                                                    name=self.name,
                                                                    image=self._image))
@@ -119,6 +122,7 @@ class DockerVM(BaseNode):
             "project_id": self._project.id,
             "image": self._image,
             "adapters": self.adapters,
+            "mac_address": self.mac_address,
             "console": self.console,
             "console_type": self.console_type,
             "console_resolution": self.console_resolution,
@@ -149,6 +153,36 @@ class DockerVM(BaseNode):
     def ethernet_adapters(self):
         return self._ethernet_adapters
 
+    @property
+    def mac_address(self):
+        """
+        Returns the MAC address for this Docker container.
+
+        :returns: adapter type (string)
+        """
+
+        return self._mac_address
+
+    @mac_address.setter
+    def mac_address(self, mac_address):
+        """
+        Sets the MAC address for this Docker container.
+
+        :param mac_address: MAC address
+        """
+
+        if not mac_address:
+            # use the node UUID to generate a random MAC address
+            self._mac_address = "02:42:%s:%s:%s:00" % (self.id[2:4], self.id[4:6], self.id[6:8])
+        else:
+            self._mac_address = mac_address
+
+        log.info('Docker container "{name}" [{id}]: MAC address changed to {mac_addr}'.format(
+            name=self._name,
+            id=self._id,
+            mac_addr=self._mac_address)
+        )
+
     @property
     def start_command(self):
         return self._start_command
@@ -331,7 +365,7 @@ class DockerVM(BaseNode):
         try:
             image_infos = await self._get_image_information()
         except DockerHttp404Error:
-            log.info("Image '{}' is missing, pulling it from Docker hub...".format(self._image))
+            log.info("Image '{}' is missing, pulling it from Docker repository...".format(self._image))
             await self.pull_image(self._image)
             image_infos = await self._get_image_information()
 
@@ -349,6 +383,7 @@ class DockerVM(BaseNode):
                 "CapAdd": ["ALL"],
                 "Privileged": True,
                 "Binds": self._mount_binds(image_infos),
+                "UsernsMode": "host",
             },
             "Volumes": {},
             "Env": ["container=docker"],  # Systemd compliant: https://github.com/GNS3/gns3-server/issues/573
@@ -481,9 +516,13 @@ class DockerVM(BaseNode):
                 await self._start_vnc_process(restart=True)
                 monitor_process(self._vnc_process, self._vnc_callback)
 
+            if self._console_websocket:
+                await self._console_websocket.close()
+                self._console_websocket = None
             await self._clean_servers()
 
             await self.manager.query("POST", "containers/{}/start".format(self._cid))
+            await asyncio.sleep(0.5)  # give the Docker container some time to start
             self._namespace = await self._get_namespace()
 
             await self._start_ubridge(require_privileged_access=True)
@@ -672,7 +711,10 @@ class DockerVM(BaseNode):
         """
 
         # resize the container TTY.
-        await self._manager.query("POST", "containers/{}/resize?h={}&w={}".format(self._cid, rows, columns))
+        try:
+            await self._manager.query("POST", "containers/{}/resize?h={}&w={}".format(self._cid, rows, columns))
+        except DockerError as e:
+            log.warning(f"Could not resize the container TTY: {e}")
 
     async def _start_console(self):
         """
@@ -702,9 +744,7 @@ class DockerVM(BaseNode):
 
         self._console_websocket = await self.manager.websocket_query("containers/{}/attach/ws?stream=1&stdin=1&stdout=1&stderr=1".format(self._cid))
         input_stream.ws = self._console_websocket
-
         output_stream.feed_data(self.name.encode() + b" console is now available... Press RETURN to get started.\r\n")
-
         asyncio.ensure_future(self._read_console_output(self._console_websocket, output_stream))
 
     async def _read_console_output(self, ws, out):
@@ -727,13 +767,14 @@ class DockerVM(BaseNode):
                 out.feed_eof()
                 await ws.close()
                 break
-        await self.stop()
 
     async def reset_console(self):
         """
         Reset the console.
         """
 
+        if self._console_websocket:
+            await self._console_websocket.close()
         await self._clean_servers()
         await self._start_console()
 
@@ -778,6 +819,9 @@ class DockerVM(BaseNode):
         """
 
         try:
+            if self._console_websocket:
+                await self._console_websocket.close()
+                self._console_websocket = None
             await self._clean_servers()
             await self._stop_ubridge()
 
@@ -909,15 +953,33 @@ class DockerVM(BaseNode):
         bridge_name = 'bridge{}'.format(adapter_number)
         await self._ubridge_send('bridge create {}'.format(bridge_name))
         self._bridges.add(bridge_name)
-        await self._ubridge_send('bridge add_nio_tap bridge{adapter_number} {hostif}'.format(adapter_number=adapter_number,
-                                                                                                  hostif=adapter.host_ifc))
+        await self._ubridge_send('bridge add_nio_tap bridge{adapter_number} {hostif}'.format(
+            adapter_number=adapter_number,
+            hostif=adapter.host_ifc)
+        )
+
+        mac_address = int_to_macaddress(macaddress_to_int(self._mac_address) + adapter_number)
+        custom_adapter = self._get_custom_adapter_settings(adapter_number)
+        custom_mac_address = custom_adapter.get("mac_address")
+        if custom_mac_address:
+            mac_address = custom_mac_address
+
+        try:
+            await self._ubridge_send('docker set_mac_addr {ifc} {mac}'.format(ifc=adapter.host_ifc, mac=mac_address))
+        except UbridgeError:
+            log.warning("Could not set MAC address %s on interface %s", mac_address, adapter.host_ifc)
+
         log.debug("Move container %s adapter %s to namespace %s", self.name, adapter.host_ifc, self._namespace)
         try:
-            await self._ubridge_send('docker move_to_ns {ifc} {ns} eth{adapter}'.format(ifc=adapter.host_ifc,
-                                                                                             ns=self._namespace,
-                                                                                             adapter=adapter_number))
+            await self._ubridge_send('docker move_to_ns {ifc} {ns} eth{adapter}'.format(
+                ifc=adapter.host_ifc,
+                ns=self._namespace,
+                adapter=adapter_number)
+            )
         except UbridgeError as e:
             raise UbridgeNamespaceError(e)
+        else:
+            log.info("Created adapter %s with MAC address %s in namespace %s", adapter_number, mac_address, self._namespace)
 
         if nio:
             await self._connect_nio(adapter_number, nio)

gns3server/compute/docker/resources/init.sh

@@ -25,7 +25,10 @@ PATH=/gns3/bin:/tmp/gns3/bin:/sbin:$PATH
 # bootstrap busybox commands
 if [ ! -d /tmp/gns3/bin ]; then
 	busybox mkdir -p /tmp/gns3/bin
-	/gns3/bin/busybox --install -s /tmp/gns3/bin
+	for applet in `busybox --list`
+	do
+	  ln -s /gns3/bin/busybox "/tmp/gns3/bin/$applet"
+	done
 fi
 
 #  Restore file permission and mount volumes
@@ -75,7 +78,7 @@ ip link set dev lo up
 while true 
 do
     grep $GNS3_MAX_ETHERNET /proc/net/dev > /dev/null && break
-    sleep 0.5
+    usleep 500000  # wait 0.5 seconds
 done  
 
 # activate eth interfaces

gns3server/compute/iou/iou_vm.py

@@ -390,14 +390,16 @@ class IOUVM(BaseNode):
             raise IOUError("The following shared library dependencies cannot be found for IOU image {}: {}".format(self._path,
                                                                                                                    ", ".join(missing_libs)))
 
-    async def _check_iou_licence(self):
+    def _is_iou_license_check_enabled(self):
         """
-        Checks for a valid IOU key in the iourc file (paranoid mode).
+        Returns if IOU license check is enabled.
+
+        :return: boolean
         """
 
         # license check is sent by the controller
         if self.license_check is False:
-            return
+            return False
 
         try:
             # we allow license check to be disabled server wide
@@ -407,7 +409,14 @@ class IOUVM(BaseNode):
 
         if server_wide_license_check is False:
             log.warning("License check is explicitly disabled on this server")
-            return
+            return False
+
+        return True
+
+    async def _check_iou_license(self):
+        """
+        Checks for a valid IOU key in the iourc file (paranoid mode).
+        """
 
         config = configparser.ConfigParser()
         try:
@@ -511,15 +520,16 @@ class IOUVM(BaseNode):
             except OSError as e:
                 raise IOUError("Could not rename nvram files: {}".format(e))
 
-            iourc_path = self.iourc_path
-            if not iourc_path:
-                raise IOUError("Could not find an iourc file (IOU license), please configure an IOU license")
-            if not os.path.isfile(iourc_path):
-                raise IOUError("The iourc path '{}' is not a regular file".format(iourc_path))
+            iourc_path = None
+            if self._is_iou_license_check_enabled():
+                iourc_path = self.iourc_path
+                if not iourc_path:
+                    raise IOUError("Could not find an iourc file (IOU license), please configure an IOU license")
+                if not os.path.isfile(iourc_path):
+                    raise IOUError("The iourc path '{}' is not a regular file".format(iourc_path))
+                await self._check_iou_license()
 
-            await self._check_iou_licence()
             await self._start_ubridge()
-
             self._create_netmap_config()
             if self.use_default_iou_values:
                 # make sure we have the default nvram amount to correctly push the configs
@@ -531,7 +541,7 @@ class IOUVM(BaseNode):
 
             self._nvram_watcher = FileWatcher(self._nvram_file(), self._nvram_changed, delay=2)
 
-            # created a environment variable pointing to the iourc file.
+            # created an environment variable pointing to the iourc file.
             env = os.environ.copy()
             if "IOURC" not in os.environ and iourc_path:
                 env["IOURC"] = iourc_path

gns3server/compute/qemu/__init__.py

@@ -226,7 +226,7 @@ class Qemu(BaseManager):
         else:
             try:
                 output = await subprocess_check_output(qemu_path, "-version", "-nographic")
-                match = re.search("version\s+([0-9a-z\-\.]+)", output)
+                match = re.search(r"version\s+([0-9a-z\-\.]+)", output)
                 if match:
                     version = match.group(1)
                     return version

gns3server/compute/qemu/qemu_vm.py

@@ -33,6 +33,7 @@ import gns3server
 import subprocess
 import time
 import json
+import psutil
 
 from gns3server.utils import parse_version, shlex_quote
 from gns3server.utils.asyncio import subprocess_check_output, cancellable_wait_run_in_executor
@@ -47,12 +48,18 @@ from ..base_node import BaseNode
 from ...schemas.qemu import QEMU_OBJECT_SCHEMA, QEMU_PLATFORMS
 from ...utils.asyncio import monitor_process
 from ...utils.images import md5sum
-from ...utils import macaddress_to_int, int_to_macaddress
+from ...utils import macaddress_to_int, int_to_macaddress, is_ipv6_enabled
 
 
 import logging
 log = logging.getLogger(__name__)
 
+# forbidden additional options
+FORBIDDEN_OPTIONS = {"-blockdev", "-drive", "-hda", "-hdb", "-hdc", "-hdd",
+                     "-fsdev", "-virtfs", "-nic", "-netdev"}
+FORBIDDEN_OPTIONS |= {"-" + opt for opt in FORBIDDEN_OPTIONS
+                      if opt.startswith("-") and not opt.startswith("--")}
+
 
 class QemuVM(BaseNode):
     module_name = 'qemu'
@@ -218,7 +225,7 @@ class QemuVM(BaseNode):
             if qemu_bin == "qemu":
                 self._platform = "i386"
             else:
-                self._platform = re.sub(r'^qemu-system-(\w+).*$', r'\1', qemu_bin, re.IGNORECASE)
+                self._platform = re.sub(r'^qemu-system-(\w+).*$', r'\1', qemu_bin, flags=re.IGNORECASE)
         if self._platform.split(".")[0] not in QEMU_PLATFORMS:
             raise QemuError("Platform {} is unknown".format(self._platform))
         log.info('QEMU VM "{name}" [{id}] has set the QEMU path to {qemu_path}'.format(name=self._name,
@@ -1160,6 +1167,21 @@ class QemuVM(BaseNode):
         except OSError as e:
             raise QemuError("Could not start Telnet QEMU console {}\n".format(e))
 
+    def _find_partition_for_path(self, path):
+        """
+        Finds the disk partition for a given path.
+        """
+
+        path = os.path.abspath(path)
+        partitions = psutil.disk_partitions()
+        # find the partition with the longest matching mount point
+        matching_partition = None
+        for partition in partitions:
+            if path.startswith(partition.mountpoint):
+                if matching_partition is None or len(partition.mountpoint) > len(matching_partition.mountpoint):
+                    matching_partition = partition
+        return matching_partition
+
     async def _termination_callback(self, returncode):
         """
         Called when the process has stopped.
@@ -1172,7 +1194,17 @@ class QemuVM(BaseNode):
             await self.stop()
             # A return code of 1 seem fine on Windows
             if returncode != 0 and (not sys.platform.startswith("win") or returncode != 1):
-                self.project.emit("log.error", {"message": "QEMU process has stopped, return code: {}\n{}".format(returncode, self.read_stdout())})
+                qemu_stdout = self.read_stdout()
+                # additional permissions need to be configured for swtpm in AppArmor if the working dir
+                # is located on a different partition than the partition for the root directory
+                if "TPM result for CMD_INIT" in qemu_stdout:
+                    partition = self._find_partition_for_path(self.project.path)
+                    if partition and partition.mountpoint != "/":
+                        qemu_stdout += "\nTPM error: the project directory is not on the same partition as the root directory which can be a problem when using AppArmor.\n" \
+                                        "Please try to execute the following commands on the server:\n\n" \
+                                        "echo 'owner {}/** rwk,' | sudo tee /etc/apparmor.d/local/usr.bin.swtpm > /dev/null\n" \
+                                        "sudo service apparmor restart".format(os.path.dirname(self.project.path))
+                self.project.emit("log.error", {"message": "QEMU process has stopped, return code: {}\n{}".format(returncode, qemu_stdout)})
 
     async def stop(self):
         """
@@ -1672,13 +1704,14 @@ class QemuVM(BaseNode):
         if self._console:
             console_host = self._manager.port_manager.console_host
             if console_host == "0.0.0.0":
-                if socket.has_ipv6:
-                    # to fix an issue with Qemu when IPv4 is not enabled
-                    # see https://github.com/GNS3/gns3-gui/issues/2352
-                    # FIXME: consider making this more global (not just for Qemu + SPICE)
-                    console_host = "::"
-                else:
-                    raise QemuError("IPv6 must be enabled in order to use the SPICE console")
+                try:
+                    if is_ipv6_enabled():
+                        # to fix an issue with Qemu when IPv4 is not enabled
+                        # see https://github.com/GNS3/gns3-gui/issues/2352
+                        # FIXME: consider making this more global (not just for Qemu + SPICE)
+                        console_host = "::"
+                except OSError as e:
+                    raise QemuError("Could not check if IPv6 is enabled: {}".format(e))
             return ["-spice",
                     "addr={},port={},disable-ticketing".format(console_host, self._console),
                     "-vga", "qxl"]
@@ -1908,11 +1941,6 @@ class QemuVM(BaseNode):
                 continue
 
             interface = getattr(self, "hd{}_disk_interface".format(drive))
-            # fail-safe: use "ide" if there is a disk image and no interface type has been explicitly configured
-            if interface == "none":
-                interface = "ide"
-                setattr(self, "hd{}_disk_interface".format(drive), interface)
-
             disk_name = "hd" + drive
             if not os.path.isfile(disk_image) or not os.path.exists(disk_image):
                 if os.path.islink(disk_image):
@@ -2027,19 +2055,42 @@ class QemuVM(BaseNode):
                 else:
                     raise QemuError("bios image '{}' is not accessible".format(self._bios_image))
             options.extend(["-bios", self._bios_image.replace(",", ",,")])
+
         elif self._uefi:
-            # get the OVMF firmware from the images directory
-            ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE.fd")
+
+            old_ovmf_vars_path = os.path.join(self.working_dir, "OVMF_VARS.fd")
+            if os.path.exists(old_ovmf_vars_path):
+                # the node has its own UEFI variables store already, we must also use the old UEFI firmware
+                ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE.fd")
+            else:
+                system_ovmf_firmware_path = "/usr/share/OVMF/OVMF_CODE_4M.fd"
+                if os.path.exists(system_ovmf_firmware_path):
+                    ovmf_firmware_path = system_ovmf_firmware_path
+                else:
+                    # otherwise, get the UEFI firmware from the images directory
+                    ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE_4M.fd")
+
             log.info("Configuring UEFI boot mode using OVMF file: '{}'".format(ovmf_firmware_path))
             options.extend(["-drive", "if=pflash,format=raw,readonly,file={}".format(ovmf_firmware_path)])
 
+            # try to use the UEFI variables store from the system first
+            system_ovmf_vars_path = "/usr/share/OVMF/OVMF_VARS_4M.fd"
+            if os.path.exists(system_ovmf_vars_path):
+                ovmf_vars_path = system_ovmf_vars_path
+            else:
+                # otherwise, get the UEFI variables store from the images directory
+                ovmf_vars_path = self.manager.get_abs_image_path("OVMF_VARS_4M.fd")
+
             # the node should have its own copy of OVMF_VARS.fd (the UEFI variables store)
-            ovmf_vars_node_path = os.path.join(self.working_dir, "OVMF_VARS.fd")
-            if not os.path.exists(ovmf_vars_node_path):
-                try:
-                    shutil.copyfile(self.manager.get_abs_image_path("OVMF_VARS.fd"), ovmf_vars_node_path)
-                except OSError as e:
-                    raise QemuError("Cannot copy OVMF_VARS.fd file to the node working directory: {}".format(e))
+            if os.path.exists(old_ovmf_vars_path):
+                ovmf_vars_node_path = old_ovmf_vars_path
+            else:
+                ovmf_vars_node_path = os.path.join(self.working_dir, "OVMF_VARS_4M.fd")
+                if not os.path.exists(ovmf_vars_node_path):
+                    try:
+                        shutil.copyfile(ovmf_vars_path, ovmf_vars_node_path)
+                    except OSError as e:
+                        raise QemuError("Cannot copy OVMF_VARS_4M.fd file to the node working directory: {}".format(e))
             options.extend(["-drive", "if=pflash,format=raw,file={}".format(ovmf_vars_node_path)])
         return options
 
@@ -2423,9 +2474,19 @@ class QemuVM(BaseNode):
             command.extend(self._tpm_options())
         if additional_options:
             try:
-                command.extend(shlex.split(additional_options))
+                additional_opt_list = shlex.split(additional_options)
             except ValueError as e:
                 raise QemuError("Invalid additional options: {} error {}".format(additional_options, e))
+            allow_unsafe_options = self.manager.config.get_section_config("Qemu").getboolean(
+                "allow_unsafe_options",
+                False
+            )
+            if allow_unsafe_options is False:
+                for opt in additional_opt_list:
+                    if opt in FORBIDDEN_OPTIONS:
+                        raise QemuError("Forbidden additional option: {}".format(opt))
+            command.extend(additional_opt_list)
+
         # avoiding mouse offset (see https://github.com/GNS3/gns3-server/issues/2335)
         if self._console_type == "vnc":
             command.extend(['-machine', 'usb=on', '-device', 'usb-tablet'])

gns3server/compute/virtualbox/virtualbox_vm.py

@@ -218,28 +218,45 @@ class VirtualBoxVM(BaseNode):
         """
         Fix the VM uuid in the case of linked clone
         """
-        if os.path.exists(self._linked_vbox_file()):
-            try:
-                tree = ET.parse(self._linked_vbox_file())
-            except ET.ParseError:
-                raise VirtualBoxError("Cannot modify VirtualBox linked nodes file. "
-                                      "File {} is corrupted.".format(self._linked_vbox_file()))
-            except OSError as e:
-                raise VirtualBoxError("Cannot modify VirtualBox linked nodes file '{}': {}".format(self._linked_vbox_file(), e))
 
-            machine = tree.getroot().find("{http://www.virtualbox.org/}Machine")
-            if machine is not None and machine.get("uuid") != "{" + self.id + "}":
+        linked_vbox_file = self._linked_vbox_file()
+        if not os.path.exists(linked_vbox_file):
+            raise VirtualBoxError("Cannot find VirtualBox linked node file: {}".format(linked_vbox_file))
 
-                for image in tree.getroot().findall("{http://www.virtualbox.org/}Image"):
-                    currentSnapshot = machine.get("currentSnapshot")
-                    if currentSnapshot:
-                        newSnapshot = re.sub(r"\{.*\}", "{" + str(uuid.uuid4()) + "}", currentSnapshot)
-                    shutil.move(os.path.join(self.working_dir, self._vmname, "Snapshots", currentSnapshot) + ".vdi",
-                                os.path.join(self.working_dir, self._vmname, "Snapshots", newSnapshot) + ".vdi")
-                    image.set("uuid", newSnapshot)
+        try:
+            tree = ET.parse(linked_vbox_file)
+        except ET.ParseError:
+            raise VirtualBoxError("Cannot modify VirtualBox linked node file. "
+                                  "File {} is corrupted.".format(linked_vbox_file))
+        except OSError as e:
+            raise VirtualBoxError("Cannot modify VirtualBox linked node file '{}': {}".format(linked_vbox_file, e))
 
-                machine.set("uuid", "{" + self.id + "}")
-                tree.write(self._linked_vbox_file())
+        machine = tree.getroot().find("{http://www.virtualbox.org/}Machine")
+        if machine is not None and machine.get("uuid") != "{" + self.id + "}":
+
+            for image in tree.getroot().findall("{http://www.virtualbox.org/}Image"):
+                currentSnapshot = machine.get("currentSnapshot")
+                if currentSnapshot:
+                    newSnapshot = re.sub(r"\{.*\}", "{" + str(uuid.uuid4()) + "}", currentSnapshot)
+                shutil.move(
+                    os.path.join(self.working_dir, self._vmname, "Snapshots", currentSnapshot) + ".vdi",
+                    os.path.join(self.working_dir, self._vmname, "Snapshots", newSnapshot) + ".vdi"
+                )
+                log.info("VirtualBox VM '{name}' [{id}] snapshot file moved from '{current}' to '{new}'".format(
+                    name=self.name,
+                    id=self.id,
+                    current=currentSnapshot,
+                    new=newSnapshot,
+                ))
+                image.set("uuid", newSnapshot)
+
+            log.info("VirtualBox VM '{name}' [{id}] '{vbox_file}' has been patched".format(
+                name=self.name,
+                id=self.id,
+                vbox_file=linked_vbox_file,
+            ))
+            machine.set("uuid", "{" + self.id + "}")
+            tree.write(linked_vbox_file)
 
     async def check_hw_virtualization(self):
         """
@@ -458,7 +475,7 @@ class VirtualBoxVM(BaseNode):
 
     async def save_linked_hdds_info(self):
         """
-        Save linked cloned hard disks information.
+        Save linked cloned hard disk information.
 
         :returns: disk table information
         """

gns3server/compute/vmware/__init__.py

@@ -701,7 +701,7 @@ class VMware(BaseManager):
             path = ctypes.create_unicode_buffer(ctypes.wintypes.MAX_PATH)
             ctypes.windll.shell32.SHGetFolderPathW(None, 5, None, 0, path)
             documents_folder = path.value
-            return ['{}\My Virtual Machines'.format(documents_folder), '{}\Virtual Machines'.format(documents_folder)]
+            return [r'{}\My Virtual Machines'.format(documents_folder), r'{}\Virtual Machines'.format(documents_folder)]
         elif sys.platform.startswith("darwin"):
             return [os.path.expanduser("~/Documents/Virtual Machines.localized")]
         else:

gns3server/configs/iou_l2_base_startup-config.txt

@@ -15,7 +15,7 @@ no ip icmp rate-limit unreachable
 !
 ! due to some bugs with IOU, try to change the following line to 'ip cef' if your routing does not work
 no ip cef
-no ip domain-lookup
+no ip domain lookup
 !
 !
 !

gns3server/configs/iou_l3_base_startup-config.txt

@@ -14,7 +14,7 @@ no ip icmp rate-limit unreachable
 !
 ! due to some bugs with IOU, try to change the following line to 'ip cef' if your routing does not work
 no ip cef
-no ip domain-lookup
+no ip domain lookup
 !
 !
 ip tcp synwait-time 5

gns3server/controller/__init__.py

@@ -29,7 +29,7 @@ except ImportError:
     from importlib import resources as importlib_resources
 
 from ..config import Config
-from ..utils import parse_version
+from ..utils import parse_version, md5sum
 from ..utils.images import default_images_directory
 
 from .project import Project
@@ -248,13 +248,19 @@ class Controller:
         if "iou_license" in controller_settings:
             self._iou_license_settings = controller_settings["iou_license"]
 
-        previous_version = controller_settings.get("version")
-        log.info("Comparing controller version {} with config version {}".format(__version__, previous_version))
-        if not previous_version or \
-                parse_version(__version__.split("+")[0]) > parse_version(previous_version.split("+")[0]):
-            self._appliance_manager.install_builtin_appliances()
-        elif not os.listdir(self._appliance_manager.builtin_appliances_path()):
-            self._appliance_manager.install_builtin_appliances()
+        # install the built-in appliances if needed
+        server_config = Config.instance().get_section_config("Server")
+        if server_config.getboolean("install_builtin_appliances", True):
+            previous_version = controller_settings.get("version")
+            log.info("Comparing controller version {} with config version {}".format(__version__, previous_version))
+            builtin_appliances_path = self._appliance_manager.builtin_appliances_path()
+            if not previous_version or \
+                    parse_version(__version__.split("+")[0]) > parse_version(previous_version.split("+")[0]):
+                self._appliance_manager.install_builtin_appliances()
+            elif not os.listdir(builtin_appliances_path):
+                self._appliance_manager.install_builtin_appliances()
+            else:
+                log.info("Built-in appliances are installed in '{}'".format(builtin_appliances_path))
 
         self._appliance_manager.appliances_etag = controller_settings.get("appliances_etag")
         self._appliance_manager.load_appliances()
@@ -283,12 +289,21 @@ class Controller:
         except OSError as e:
             log.error(str(e))
 
+
     @staticmethod
-    def install_resource_files(dst_path, resource_name):
+    def install_resource_files(dst_path, resource_name, upgrade_resources=True):
         """
         Install files from resources to user's file system
         """
 
+        def should_copy(src, dst, upgrade_resources):
+            if not os.path.exists(dst):
+                return True
+            if upgrade_resources is False:
+                return False
+            # copy the resource if it is different
+            return md5sum(src) != md5sum(dst)
+
         if hasattr(sys, "frozen") and sys.platform.startswith("win"):
             resource_path = os.path.normpath(os.path.join(os.path.dirname(sys.executable), resource_name))
             for filename in os.listdir(resource_path):
@@ -297,7 +312,7 @@ class Controller:
         else:
             for entry in importlib_resources.files('gns3server').joinpath(resource_name).iterdir():
                 full_path = os.path.join(dst_path, entry.name)
-                if entry.is_file() and not os.path.exists(full_path):
+                if entry.is_file() and should_copy(str(entry), full_path, upgrade_resources):
                     log.debug(f'Installing {resource_name} resource file "{entry.name}" to "{full_path}"')
                     shutil.copy(str(entry), os.path.join(dst_path, entry.name))
                 elif entry.is_dir():
@@ -313,7 +328,7 @@ class Controller:
         dst_path = self.configs_path()
         log.info(f"Installing base configs in '{dst_path}'")
         try:
-            Controller.install_resource_files(dst_path, "configs")
+            Controller.install_resource_files(dst_path, "configs", upgrade_resources=False)
         except OSError as e:
             log.error(f"Could not install base config files to {dst_path}: {e}")
 
@@ -326,7 +341,7 @@ class Controller:
         dst_path = self.disks_path()
         log.info(f"Installing built-in disks in '{dst_path}'")
         try:
-            Controller.install_resource_files(dst_path, "disks")
+            Controller.install_resource_files(dst_path, "disks", upgrade_resources=False)
         except OSError as e:
             log.error(f"Could not install disk files to {dst_path}: {e}")
 

gns3server/controller/appliance_manager.py

@@ -82,15 +82,15 @@ class ApplianceManager:
         os.makedirs(appliances_path, exist_ok=True)
         return appliances_path
 
-    def builtin_appliances_path(self, delete_first=False):
+    def builtin_appliances_path(self):
         """
         Get the built-in appliance storage directory
         """
 
+        server_config = Config.instance().get_section_config("Server")
         appname = vendor = "GNS3"
-        appliances_dir = os.path.join(platformdirs.user_data_dir(appname, vendor, roaming=True), "appliances")
-        if delete_first:
-            shutil.rmtree(appliances_dir, ignore_errors=True)
+        resources_path = os.path.expanduser(server_config.get("resources_path", platformdirs.user_data_dir(appname, vendor, roaming=True)))
+        appliances_dir = os.path.join(resources_path, "appliances")
         os.makedirs(appliances_dir, exist_ok=True)
         return appliances_dir
 
@@ -99,7 +99,7 @@ class ApplianceManager:
         At startup we copy the built-in appliances files.
         """
 
-        dst_path = self.builtin_appliances_path(delete_first=True)
+        dst_path = self.builtin_appliances_path()
         log.info(f"Installing built-in appliances in '{dst_path}'")
         from . import Controller
         try:

gns3server/controller/compute.py

@@ -18,14 +18,19 @@
 import ipaddress
 import aiohttp
 import asyncio
-import async_timeout
 import socket
 import json
 import uuid
 import sys
 import io
+
 from operator import itemgetter
 
+if sys.version_info >= (3, 11):
+    from asyncio import timeout as asynctimeout
+else:
+    from async_timeout import timeout as asynctimeout
+
 from ..utils import parse_version
 from ..utils.asyncio import locking
 from ..controller.controller_error import ControllerError
@@ -483,8 +488,8 @@ class Compute:
         """ Returns URL for specific path at Compute"""
         return self._getUrl(path)
 
-    async def _run_http_query(self, method, path, data=None, timeout=20, raw=False):
-        with async_timeout.timeout(timeout):
+    async def _run_http_query(self, method, path, data=None, timeout=120, raw=False):
+        async with asynctimeout(delay=timeout):
             url = self._getUrl(path)
             headers = {}
             headers['content-type'] = 'application/json'

gns3server/controller/export_project.py

@@ -32,7 +32,7 @@ log = logging.getLogger(__name__)
 CHUNK_SIZE = 1024 * 8  # 8KB
 
 
-async def export_project(zstream, project, temporary_dir, include_images=False, include_snapshots=False, keep_compute_id=False, allow_all_nodes=False, reset_mac_addresses=False):
+async def export_project(zstream, project, temporary_dir, include_images=False, include_snapshots=False, keep_compute_ids=False, allow_all_nodes=False, reset_mac_addresses=False):
     """
     Export a project to a zip file.
 
@@ -44,9 +44,9 @@ async def export_project(zstream, project, temporary_dir, include_images=False,
     :param temporary_dir: A temporary dir where to store intermediate data
     :param include_images: save OS images to the zip file
     :param include_snapshots: save snapshots to the zip file
-    :param keep_compute_id: If false replace all compute id by local (standard behavior for .gns3project to make it portable)
-    :param allow_all_nodes: Allow all nodes type to be include in the zip even if not portable
-    :param reset_mac_addresses: Reset MAC addresses for every nodes.
+    :param keep_compute_ids: If false replace all compute IDs y local (standard behavior for .gns3project to make it portable)
+    :param allow_all_nodes: Allow all nodes type to be included in the zip even if not portable
+    :param reset_mac_addresses: Reset MAC addresses for each node.
     """
 
     # To avoid issue with data not saved we disallow the export of a running project
@@ -62,7 +62,7 @@ async def export_project(zstream, project, temporary_dir, include_images=False,
     # First we process the .gns3 in order to be sure we don't have an error
     for file in os.listdir(project._path):
         if file.endswith(".gns3"):
-            await _patch_project_file(project, os.path.join(project._path, file), zstream, include_images, keep_compute_id, allow_all_nodes, temporary_dir, reset_mac_addresses)
+            await _patch_project_file(project, os.path.join(project._path, file), zstream, include_images, keep_compute_ids, allow_all_nodes, temporary_dir, reset_mac_addresses)
 
     # Export the local files
     for root, dirs, files in os.walk(project._path, topdown=True, followlinks=False):
@@ -70,14 +70,15 @@ async def export_project(zstream, project, temporary_dir, include_images=False,
             files = [f for f in files if _is_exportable(os.path.join(root, f), include_snapshots)]
             for file in files:
                 path = os.path.join(root, file)
-                # check if we can export the file
-                try:
-                    open(path).close()
-                except OSError as e:
-                    msg = "Could not export file {}: {}".format(path, e)
-                    log.warning(msg)
-                    project.emit_notification("log.warning", {"message": msg})
-                    continue
+                if not os.path.islink(path):
+                    try:
+                        # check if we can export the file
+                        open(path).close()
+                    except OSError as e:
+                        msg = "Could not export file {}: {}".format(path, e)
+                        log.warning(msg)
+                        project.emit_notification("log.warning", {"message": msg})
+                        continue
                 # ignore the .gns3 file
                 if file.endswith(".gns3"):
                     continue
@@ -128,7 +129,7 @@ def _patch_mtime(path):
     if sys.platform.startswith("win"):
         # only UNIX type platforms
         return
-    st = os.stat(path)
+    st = os.stat(path, follow_symlinks=False)
     file_date = datetime.fromtimestamp(st.st_mtime)
     if file_date.year < 1980:
         new_mtime = file_date.replace(year=1980).timestamp()
@@ -144,10 +145,6 @@ def _is_exportable(path, include_snapshots=False):
     if include_snapshots is False and path.endswith("snapshots"):
         return False
 
-    # do not export symlinks
-    if os.path.islink(path):
-        return False
-
     # do not export directories of snapshots
     if include_snapshots is False and "{sep}snapshots{sep}".format(sep=os.path.sep) in path:
         return False
@@ -170,7 +167,7 @@ def _is_exportable(path, include_snapshots=False):
     return True
 
 
-async def _patch_project_file(project, path, zstream, include_images, keep_compute_id, allow_all_nodes, temporary_dir, reset_mac_addresses):
+async def _patch_project_file(project, path, zstream, include_images, keep_compute_ids, allow_all_nodes, temporary_dir, reset_mac_addresses):
     """
     Patch a project file (.gns3) to export a project.
     The .gns3 file is renamed to project.gns3
@@ -197,16 +194,19 @@ async def _patch_project_file(project, path, zstream, include_images, keep_compu
                 if not allow_all_nodes and node["node_type"] in ["virtualbox", "vmware"]:
                     raise aiohttp.web.HTTPConflict(text="Projects with a {} node cannot be exported".format(node["node_type"]))
 
-                if not keep_compute_id:
+                if not keep_compute_ids:
                     node["compute_id"] = "local"  # To make project portable all node by default run on local
 
-                if "properties" in node and node["node_type"] != "docker":
+                if "properties" in node:
                     for prop, value in node["properties"].items():
 
                         # reset the MAC address
                         if reset_mac_addresses and prop in ("mac_addr", "mac_address"):
                             node["properties"][prop] = None
 
+                        if node["node_type"] == "docker":
+                            continue
+
                         if node["node_type"] == "iou":
                             if not prop == "path":
                                 continue
@@ -215,7 +215,7 @@ async def _patch_project_file(project, path, zstream, include_images, keep_compu
                         if value is None or value.strip() == '':
                             continue
 
-                        if not keep_compute_id:  # If we keep the original compute we can keep the image path
+                        if not keep_compute_ids:  # If we keep the original compute we can keep the image path
                             node["properties"][prop] = os.path.basename(value)
 
                         if include_images is True:
@@ -225,7 +225,7 @@ async def _patch_project_file(project, path, zstream, include_images, keep_compu
                                 'image_type': node['node_type']
                             })
 
-        if not keep_compute_id:
+        if not keep_compute_ids:
             topology["topology"]["computes"] = []  # Strip compute information because could contain secret info like password
 
     local_images = set([i['image'] for i in images if i['compute_id'] == 'local'])

gns3server/controller/gns3vm/virtualbox_gns3_vm.py

@@ -247,6 +247,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
                     return True
         return False
 
+
     async def list(self):
         """
         List all VirtualBox VMs
@@ -267,8 +268,8 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
 
         # get a NAT interface number
         nat_interface_number = await self._look_for_interface("nat")
-        if nat_interface_number < 0:
-            raise GNS3VMError('VM "{}" must have a NAT interface configured in order to start'.format(self.vmname))
+        if nat_interface_number < 0 and await self._look_for_interface("natnetwork") < 0:
+            raise GNS3VMError('VM "{}" must have a NAT or NAT Network interface configured in order to start'.format(self.vmname))
 
         if sys.platform.startswith("darwin") and parse_version(self._system_properties["API version"]) >= parse_version("7_0"):
             # VirtualBox 7.0+ on macOS requires a host-only network interface
@@ -337,39 +338,68 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         elif vm_state == "paused":
             args = [self._vmname, "resume"]
             await self._execute("controlvm", args)
-        ip_address = "127.0.0.1"
-        try:
-            # get a random port on localhost
-            with socket.socket() as s:
-                s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-                s.bind((ip_address, 0))
-                api_port = s.getsockname()[1]
-        except OSError as e:
-            raise GNS3VMError("Error while getting random port: {}".format(e))
 
-        if await self._check_vbox_port_forwarding():
-            # delete the GNS3VM NAT port forwarding rule if it exists
-            log.info("Removing GNS3VM NAT port forwarding rule from interface {}".format(nat_interface_number))
-            await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number), "delete", "GNS3VM"])
+        log.info("Retrieving IP address from GNS3 VM...")
+        ip = await self._get_ip_from_guest_property()
+        if ip:
+            self.ip_address = ip
+        else:
+            # if we can't get the IP address from the guest property, we try to get it from the GNS3 server (a NAT interface is required)
+            if nat_interface_number < 0:
+                raise GNS3VMError("Could not find guest IP address for {}".format(self.vmname))
+            log.warning("Could not find IP address from guest property, trying to get it from GNS3 server")
+            ip_address = "127.0.0.1"
+            try:
+                # get a random port on localhost
+                with socket.socket() as s:
+                    s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+                    s.bind((ip_address, 0))
+                    api_port = s.getsockname()[1]
+            except OSError as e:
+                raise GNS3VMError("Error while getting random port: {}".format(e))
 
-        # add a GNS3VM NAT port forwarding rule to redirect 127.0.0.1 with random port to the port in the VM
-        log.info("Adding GNS3VM NAT port forwarding rule with port {} to interface {}".format(api_port, nat_interface_number))
-        await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number),
-                                               "GNS3VM,tcp,{},{},,{}".format(ip_address, api_port, self.port)])
+            if await self._check_vbox_port_forwarding():
+                # delete the GNS3VM NAT port forwarding rule if it exists
+                log.info("Removing GNS3VM NAT port forwarding rule from interface {}".format(nat_interface_number))
+                await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number), "delete", "GNS3VM"])
 
-        self.ip_address = await self._get_ip(interface_number, api_port)
-        log.info("GNS3 VM has been started with IP {}".format(self.ip_address))
+            # add a GNS3VM NAT port forwarding rule to redirect 127.0.0.1 with random port to the port in the VM
+            log.info("Adding GNS3VM NAT port forwarding rule with port {} to interface {}".format(api_port, nat_interface_number))
+            await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number),
+                                                   "GNS3VM,tcp,{},{},,{}".format(ip_address, api_port, self.port)])
+
+            self.ip_address = await self._get_ip_from_server(interface_number, api_port)
+
+        log.info("GNS3 VM has been started with IP '{}'".format(self.ip_address))
         self.running = True
 
-    async def _get_ip(self, hostonly_interface_number, api_port):
+    async def _get_ip_from_guest_property(self):
         """
-        Get the IP from VirtualBox.
+        Get the IP from VirtualBox by retrieving the guest property (Guest Additions must be installed).
+        """
+
+        remaining_try = 180  # try for 3 minutes
+        while remaining_try > 0:
+            result = await self._execute("guestproperty", ["get", self._vmname, "/VirtualBox/GuestInfo/Net/0/V4/IP"])
+            for info in result.splitlines():
+                if ':' in info:
+                    name, value = info.split(':', 1)
+                    if name == "Value":
+                        return value.strip()
+            remaining_try -= 1
+            await asyncio.sleep(1)
+        return None
+
+    async def _get_ip_from_server(self, hostonly_interface_number, api_port):
+        """
+        Get the IP from VirtualBox by sending a request to the GNS3 server.
 
         Due to VirtualBox limitation the only way is to send request each
         second to a GNS3 endpoint in order to get the list of the interfaces and
         their IP and after that match it with VirtualBox host only.
         """
-        remaining_try = 300
+
+        remaining_try = 180  # try for 3 minutes
         while remaining_try > 0:
             async with aiohttp.ClientSession() as session:
                 try:

gns3server/controller/import_project.py

@@ -17,6 +17,7 @@
 
 import os
 import sys
+import stat
 import json
 import uuid
 import shutil
@@ -38,7 +39,7 @@ Handle the import of project from a .gns3project
 """
 
 
-async def import_project(controller, project_id, stream, location=None, name=None, keep_compute_id=False,
+async def import_project(controller, project_id, stream, location=None, name=None, keep_compute_ids=False,
                          auto_start=False, auto_open=False, auto_close=True):
     """
     Import a project contain in a zip file
@@ -50,7 +51,7 @@ async def import_project(controller, project_id, stream, location=None, name=Non
     :param stream: A io.BytesIO of the zipfile
     :param location: Directory for the project if None put in the default directory
     :param name: Wanted project name, generate one from the .gns3 if None
-    :param keep_compute_id: If true do not touch the compute id
+    :param keep_compute_ids: keep compute IDs unchanged
 
     :returns: Project
     """
@@ -93,6 +94,7 @@ async def import_project(controller, project_id, stream, location=None, name=Non
     try:
         with zipfile.ZipFile(stream) as zip_file:
             await wait_run_in_executor(zip_file.extractall, path)
+            _create_symbolic_links(zip_file, path)
     except zipfile.BadZipFile:
         raise aiohttp.web.HTTPConflict(text="Cannot extract files from GNS3 project (invalid zip)")
 
@@ -124,7 +126,7 @@ async def import_project(controller, project_id, stream, location=None, name=Non
         drawing["drawing_id"] = str(uuid.uuid4())
 
     # Modify the compute id of the node depending of compute capacity
-    if not keep_compute_id:
+    if not keep_compute_ids:
         # For some VM type we move them to the GNS3 VM if possible
         # unless it's a linux host without GNS3 VM
         if not sys.platform.startswith("linux") or controller.has_compute("vm"):
@@ -174,6 +176,24 @@ async def import_project(controller, project_id, stream, location=None, name=Non
     project = await controller.load_project(dot_gns3_path, load=False)
     return project
 
+def _create_symbolic_links(zip_file, path):
+    """
+    Manually create symbolic links (if any) because ZipFile does not support it.
+
+    :param zip_file: ZipFile instance
+    :param path: project location
+    """
+
+    for zip_info in zip_file.infolist():
+        if stat.S_ISLNK(zip_info.external_attr >> 16):
+            symlink_target = zip_file.read(zip_info.filename).decode()
+            symlink_path = os.path.join(path, zip_info.filename)
+            try:
+                # remove the regular file and replace it by a symbolic link
+                os.remove(symlink_path)
+                os.symlink(symlink_target, symlink_path)
+            except OSError as e:
+                raise aiohttp.web.HTTPConflict(text=f"Cannot create symbolic link: {e}")
 
 def _move_node_file(path, old_id, new_id):
     """
@@ -257,6 +277,7 @@ async def _import_snapshots(snapshots_path, project_name, project_id):
                 with open(snapshot_path, "rb") as f:
                     with zipfile.ZipFile(f) as zip_file:
                         await wait_run_in_executor(zip_file.extractall, tmpdir)
+                        _create_symbolic_links(zip_file, tmpdir)
             except OSError as e:
                 raise aiohttp.web.HTTPConflict(text="Cannot open snapshot '{}': {}".format(os.path.basename(snapshot), e))
             except zipfile.BadZipFile:

gns3server/controller/node.py

@@ -26,8 +26,8 @@ import os
 from .compute import ComputeConflict, ComputeError
 from .ports.port_factory import PortFactory, StandardPortFactory, DynamipsPortFactory
 from ..utils.images import images_directories
+from ..utils import macaddress_to_int, int_to_macaddress
 from ..config import Config
-from ..utils.qt import qt_font_to_style
 
 
 import logging
@@ -663,7 +663,13 @@ class Node:
                         break
                 port_name = "eth{}".format(adapter_number)
                 port_name = custom_adapter_settings.get("port_name", port_name)
-                self._ports.append(PortFactory(port_name, 0, adapter_number, 0, "ethernet", short_name=port_name))
+                mac_address = custom_adapter_settings.get("mac_address")
+                if not mac_address and "mac_address" in self._properties:
+                    mac_address = int_to_macaddress(macaddress_to_int(self._properties["mac_address"]) + adapter_number)
+
+                port = PortFactory(port_name, 0, adapter_number, 0, "ethernet", short_name=port_name)
+                port.mac_address = mac_address
+                self._ports.append(port)
         elif self._node_type in ("ethernet_switch", "ethernet_hub"):
             # Basic node we don't want to have adapter number
             port_number = 0

gns3server/controller/project.py

@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import sys
 import re
 import os
 import json
@@ -27,6 +28,7 @@ import aiohttp
 import aiofiles
 import tempfile
 import zipfile
+import pathlib
 
 from uuid import UUID, uuid4
 
@@ -42,8 +44,9 @@ from ..utils.application_id import get_next_application_id
 from ..utils.asyncio.pool import Pool
 from ..utils.asyncio import locking
 from ..utils.asyncio import aiozipstream
+from ..utils.asyncio import wait_run_in_executor
 from .export_project import export_project
-from .import_project import import_project
+from .import_project import import_project, _move_node_file
 
 import logging
 log = logging.getLogger(__name__)
@@ -192,7 +195,11 @@ class Project:
         if os.path.exists(snapshot_dir):
             for snap in os.listdir(snapshot_dir):
                 if snap.endswith(".gns3project"):
-                    snapshot = Snapshot(self, filename=snap)
+                    try:
+                        snapshot = Snapshot(self, filename=snap)
+                    except ValueError:
+                        log.error("Invalid snapshot file: {}".format(snap))
+                        continue
                     self._snapshots[snapshot.id] = snapshot
 
         # Create the project on demand on the compute node
@@ -581,7 +588,7 @@ class Project:
 
         if node_type == "iou":
             async with self._iou_id_lock:
-                # wait for a IOU node to be completely created before adding a new one
+                # wait for an IOU node to be completely created before adding a new one
                 # this is important otherwise we allocate the same application ID (used
                 # to generate MAC addresses) when creating multiple IOU node at the same time
                 if "properties" in kwargs.keys():
@@ -1033,14 +1040,16 @@ class Project:
         """
         Duplicate a project
 
-        It's the save as feature of the 1.X. It's implemented on top of the
-        export / import features. It will generate a gns3p and reimport it.
-        It's a little slower but we have only one implementation to maintain.
+        Implemented on top of the export / import features. It will generate a gns3p and reimport it.
+
+        NEW: fast duplication is used if possible (when there are no remote computes).
+        If not, the project is exported and reimported as explained above.
 
         :param name: Name of the new project. A new one will be generated in case of conflicts
         :param location: Parent directory of the new project
         :param reset_mac_addresses: Reset MAC addresses for the new project
         """
+
         # If the project was not open we open it temporary
         previous_status = self._status
         if self._status == "closed":
@@ -1048,6 +1057,18 @@ class Project:
 
         self.dump()
         assert self._status != "closed"
+
+        try:
+            proj = await self._fast_duplication(name, location, reset_mac_addresses)
+            if proj:
+                if previous_status == "closed":
+                    await self.close()
+                return proj
+            else:
+                log.info("Fast duplication failed, fallback to normal duplication")
+        except Exception as e:
+            raise aiohttp.web.HTTPConflict(text="Cannot duplicate project: {}".format(str(e)))
+
         try:
             begin = time.time()
 
@@ -1062,7 +1083,7 @@ class Project:
             with tempfile.TemporaryDirectory(dir=working_dir) as tmpdir:
                 # Do not compress the exported project when duplicating
                 with aiozipstream.ZipFile(compression=zipfile.ZIP_STORED) as zstream:
-                    await export_project(zstream, self, tmpdir, keep_compute_id=True, allow_all_nodes=True, reset_mac_addresses=reset_mac_addresses)
+                    await export_project(zstream, self, tmpdir, keep_compute_ids=True, allow_all_nodes=True, reset_mac_addresses=reset_mac_addresses)
 
                     # export the project to a temporary location
                     project_path = os.path.join(tmpdir, "project.gns3p")
@@ -1073,7 +1094,7 @@ class Project:
 
                     # import the temporary project
                     with open(project_path, "rb") as f:
-                        project = await import_project(self._controller, str(uuid.uuid4()), f, location=location, name=name, keep_compute_id=True)
+                        project = await import_project(self._controller, str(uuid.uuid4()), f, location=location, name=name, keep_compute_ids=True)
 
             log.info("Project '{}' duplicated in {:.4f} seconds".format(project.name, time.time() - begin))
         except (ValueError, OSError, UnicodeEncodeError) as e:
@@ -1233,3 +1254,73 @@ class Project:
 
     def __repr__(self):
         return "<gns3server.controller.Project {} {}>".format(self._name, self._id)
+
+    async def _fast_duplication(self, name=None, location=None, reset_mac_addresses=True):
+        """
+        Fast duplication of a project.
+
+        Copy the project files directly rather than in an import-export fashion.
+
+        :param name: Name of the new project. A new one will be generated in case of conflicts
+        :param location: Parent directory of the new project
+        :param reset_mac_addresses: Reset MAC addresses for the new project
+        """
+
+        # remote replication is not supported with remote computes
+        for compute in self.computes:
+            if compute.id != "local":
+                log.warning("Fast duplication is not supported with remote compute: '{}'".format(compute.id))
+                return None
+        # work dir
+        p_work = pathlib.Path(location or self.path).parent.absolute()
+        t0 = time.time()
+        new_project_id = str(uuid.uuid4())
+        if location:
+            new_project_path = p_work.joinpath(location)
+        else:
+            new_project_path = p_work.joinpath(new_project_id)
+        # copy dir
+        await wait_run_in_executor(shutil.copytree, self.path, new_project_path.as_posix(), symlinks=True, ignore_dangling_symlinks=True)
+        log.info("Project content copied from '{}' to '{}' in {}s".format(self.path, new_project_path, time.time() - t0))
+        topology = json.loads(new_project_path.joinpath('{}.gns3'.format(self.name)).read_bytes())
+        project_name = name or topology["name"]
+        # If the project name is already used we generate a new one
+        project_name = self.controller.get_free_project_name(project_name)
+        topology["name"] = project_name
+        # To avoid unexpected behavior (project start without manual operations just after import)
+        topology["auto_start"] = False
+        topology["auto_open"] = False
+        topology["auto_close"] = False
+        # change node ID
+        node_old_to_new = {}
+        for node in topology["topology"]["nodes"]:
+            new_node_id = str(uuid.uuid4())
+            if "node_id" in node:
+                node_old_to_new[node["node_id"]] = new_node_id
+                _move_node_file(new_project_path, node["node_id"], new_node_id)
+            node["node_id"] = new_node_id
+            if reset_mac_addresses:
+                if "properties" in node:
+                    for prop, value in node["properties"].items():
+                        # reset the MAC address
+                        if prop in ("mac_addr", "mac_address"):
+                            node["properties"][prop] = None
+        # change link ID
+        for link in topology["topology"]["links"]:
+            link["link_id"] = str(uuid.uuid4())
+            for node in link["nodes"]:
+                node["node_id"] = node_old_to_new[node["node_id"]]
+        # Generate new drawings id
+        for drawing in topology["topology"]["drawings"]:
+            drawing["drawing_id"] = str(uuid.uuid4())
+
+        # And we dump the updated.gns3
+        dot_gns3_path = new_project_path.joinpath('{}.gns3'.format(project_name))
+        topology["project_id"] = new_project_id
+        with open(dot_gns3_path, "w+") as f:
+            json.dump(topology, f, indent=4)
+
+        os.remove(new_project_path.joinpath('{}.gns3'.format(self.name)))
+        project = await self.controller.load_project(dot_gns3_path, load=False)
+        log.info("Project '{}' fast duplicated in {:.4f} seconds".format(project.name, time.time() - t0))
+        return project

gns3server/controller/snapshot.py

@@ -52,15 +52,13 @@ class Snapshot:
         self._project = project
         if name:
             self._name = name
-            self._created_at = datetime.now().timestamp()
-            filename = self._name + "_" + datetime.utcfromtimestamp(self._created_at).replace(tzinfo=None).strftime(FILENAME_TIME_FORMAT) + ".gns3project"
+            self._created_at = datetime.now(timezone.utc).timestamp()
+            filename = self._name + "_" + datetime.fromtimestamp(self._created_at, tz=timezone.utc).replace(tzinfo=None).strftime(FILENAME_TIME_FORMAT) + ".gns3project"
         else:
-            self._name = filename.split("_")[0]
+            self._name = filename.rsplit("_", 2)[0]
             datestring = filename.replace(self._name + "_", "").split(".")[0]
-            try:
-                self._created_at = datetime.strptime(datestring, FILENAME_TIME_FORMAT).replace(tzinfo=timezone.utc).timestamp()
-            except ValueError:
-                self._created_at = datetime.utcnow().timestamp()
+            self._created_at = datetime.strptime(datestring, FILENAME_TIME_FORMAT).replace(tzinfo=timezone.utc).timestamp()
+
         self._path = os.path.join(project.path, "snapshots", filename)
 
     @property
@@ -98,7 +96,7 @@ class Snapshot:
             with tempfile.TemporaryDirectory(dir=snapshot_directory) as tmpdir:
                 # Do not compress the snapshots
                 with aiozipstream.ZipFile(compression=zipfile.ZIP_STORED) as zstream:
-                    await export_project(zstream, self._project, tmpdir, keep_compute_id=True, allow_all_nodes=True)
+                    await export_project(zstream, self._project, tmpdir, keep_compute_ids=True, allow_all_nodes=True)
                     async with aiofiles.open(self.path, 'wb') as f:
                         async for chunk in zstream:
                             await f.write(chunk)