Release v3.0.0rc2

Fix issue with asyncio.Queue

.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/publish-api-documentation.yml

@@ -12,13 +12,13 @@ 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.7
+        python-version: 3.8
     - name: Merge changes from 3.0 branch
       run: |
         git config user.name github-actions

.github/workflows/testing.yml

@@ -13,16 +13,21 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
+        os: ["ubuntu-latest"]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        #include:
+          # only test with Python 3.10 on Windows
+        #  - os: windows-latest
+        #    python-version: "3.10"
 
     steps:
-    - uses: actions/checkout@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: Display Python version
@@ -31,6 +36,14 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install .[dev]
+
+    - 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,141 @@
 # Change Log
 
+## 3.0.0rc2 20/11/2024
+
+* Bundle web-ui v3.0.0rc2
+* Fix error 500 on PUT for cloud, nat, vmware and vpcs nodes. Fixes #2426
+* Add a duplicated project in the same resource pools as the original project if it is in any
+* Upgrade FastAPI to v0.115.5
+* Overwrite user resources when the originals have changed.
+* Relax setuptools requirement to allow for easier Debian packaging on Ubuntu Focal & Jammy
+* Increase SQLite timeout. Ref #2422
+* Fix test user with wrong creds
+* Upgrade dependencies and fix Pydantic warnings
+* Upgrade aiohttp to v3.10.10. Fixes #2411
+* Replace aiohttp.web.HTTPConflict()
+* Python 3.13 support
+
+## 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
+
+## 3.0.0rc1 11/08/2024
+
+* Bundle web-ui v3.0.0rc1
+* Convert topologies < 3.0 to have valid node hostnames
+* Fix to access resources_path and install_builtin_appliances settings
+
+## 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
+
+## 3.0.0b3 19/05/2024
+
+* Bundle web-ui v3.0.0b3
+* Fix to allow duplicating IOS routers
+* Fix to allow changing the auxiliary console for IOS router nodes.
+* Replace deprecated method datetime.utcnow()
+* Upgrade FastAPI to v0.111.0
+* Fix reset console for non running IOU devices
+* Do not allow to create a builtin template using the API.
+* Use cryptography backend for python-jose. Ref #2372
+
+## 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
+
+## 3.0.0b2 07/04/2024
+
+* Bundle web-ui v3.0.0b2
+* Fix cannot stop Docker VM while console connection is still active.
+* Support for custom Qemu path in templates and nodes
+* Fix CPU fractional values for Docker VMs.
+* Use bcrypt directly instead of passlib
+* Update CORS policy
+* Do not stop searching for Qemu binaries if one binary cannot be executed. Ref #2306
+* Fix Ethernet switch and Ethernet hub port validations. Fixes #2334
+* Update CORS policy
+
+
+## 2.2.46 26/02/2024
+
+* Bundle web-ui v2.2.46
+* Save empty directories when exporting a project
+* Backport from v3: install Docker resources in a writable location at runtime.
+* Use Docker API v1.24 to get version.
+* Drop support for Python 3.6
+* Address the telnet console bug.
+* Update welcome.py
+* Update remote-install.sh
+* Use Python 3.8 to publish API doc
+* Upgrade sentry-sdk, psutil and distro dependencies
+
+## 2.2.45 12/01/2024
+
+* Bundle web-ui v2.2.45
+* Fix mouse offset issues with VNC in Qemu. Fixes #2335
+* Add project.created, project.opened and project.deleted controller notification stream. Move project.updated and project.closed from project notification to controller notification stream.
+* Do not stop searching for Qemu binaries if one binary cannot be executed. Ref #2306
+* Fix Ethernet switch and Ethernet hub port validations. Fixes #2334
+* Update CORS policy
+* Add custom executable paths on Windows
+* Upgrade sentry-sdk and aiohttp
+
 ## 3.0.0b1 27/11/2023
 
 * Bundle web-ui v3.0.0b1

dev-requirements.txt

@@ -1,7 +1,7 @@
-pytest==7.4.2
-flake8==6.1.0
-pytest-timeout==2.2.0
-pytest-asyncio==0.21.1
-requests==2.31.0
-httpx==0.24.1 # version 0.24.1 is required by httpx_ws
-httpx_ws==0.4.2
+pytest==8.3.3
+flake8==7.1.1
+pytest-timeout==2.3.1
+pytest-asyncio==0.21.2
+requests==2.32.3
+httpx==0.27.2 # version 0.24.1 is required by httpx_ws
+httpx_ws==0.6.2

gns3server/api/routes/compute/cloud_nodes.py

@@ -85,7 +85,7 @@ def get_cloud(node: Cloud = Depends(dep_node)) -> schemas.Cloud:
 
 
 @router.put("/{node_id}", response_model=schemas.Cloud)
-def update_cloud(node_data: schemas.CloudUpdate, node: Cloud = Depends(dep_node)) -> schemas.Cloud:
+async def update_cloud(node_data: schemas.CloudUpdate, node: Cloud = Depends(dep_node)) -> schemas.Cloud:
     """
     Update a cloud node.
     """

gns3server/api/routes/compute/docker_nodes.py

@@ -69,6 +69,7 @@ async def create_docker_node(project_id: UUID, node_data: schemas.DockerCreate)
         start_command=node_data.get("start_command"),
         environment=node_data.get("environment"),
         adapters=node_data.get("adapters"),
+        mac_address=node_data.get("mac_address"),
         console=node_data.get("console"),
         console_type=node_data.get("console_type"),
         console_resolution=node_data.get("console_resolution", "1024x768"),
@@ -124,6 +125,8 @@ async def update_docker_node(node_data: schemas.DockerUpdate, node: DockerVM = D
         "start_command",
         "environment",
         "adapters",
+        "mac_address",
+        "custom_adapters",
         "extra_hosts",
         "extra_volumes",
         "memory",

gns3server/api/routes/compute/dynamips_nodes.py

@@ -20,7 +20,7 @@ API routes for Dynamips nodes.
 
 import os
 
-from fastapi import APIRouter, WebSocket, Depends, status
+from fastapi import APIRouter, WebSocket, Body, Depends, status
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import StreamingResponse
 from typing import List, Union
@@ -334,7 +334,7 @@ async def get_auto_idlepc(node: Router = Depends(dep_node)) -> dict:
     status_code=status.HTTP_201_CREATED,
     dependencies=[Depends(compute_authentication)]
 )
-async def duplicate_router(destination_node_id: UUID, node: Router = Depends(dep_node)) -> schemas.Dynamips:
+async def duplicate_router(destination_node_id: UUID = Body(..., embed=True), node: Router = Depends(dep_node)) -> schemas.Dynamips:
     """
     Duplicate a router.
     """

gns3server/api/routes/compute/nat_nodes.py

@@ -80,7 +80,7 @@ def get_nat_node(node: Nat = Depends(dep_node)) -> schemas.NAT:
 
 
 @router.put("/{node_id}", response_model=schemas.NAT)
-def update_nat_node(node_data: schemas.NATUpdate, node: Nat = Depends(dep_node)) -> schemas.NAT:
+async def update_nat_node(node_data: schemas.NATUpdate, node: Nat = Depends(dep_node)) -> schemas.NAT:
     """
     Update a NAT node.
     """

gns3server/api/routes/compute/notifications.py

@@ -50,11 +50,7 @@ async def project_ws_notifications(websocket: Union[None, WebSocket] = Depends(w
             log.info(f"Client {websocket.client.host}:{websocket.client.port} has disconnected from compute WebSocket")
         except WebSocketException as e:
             log.warning(f"Error while sending to controller event to WebSocket client: {e}")
-        finally:
-            try:
-                await websocket.close()
-            except OSError:
-                pass  # ignore OSError: [Errno 107] Transport endpoint is not connected
+
 
 if __name__ == "__main__":
 

gns3server/api/routes/compute/vmware_nodes.py

@@ -97,7 +97,7 @@ def get_vmware_node(node: VMwareVM = Depends(dep_node)) -> schemas.VMware:
     response_model=schemas.VMware,
     dependencies=[Depends(compute_authentication)]
 )
-def update_vmware_node(node_data: schemas.VMwareUpdate, node: VMwareVM = Depends(dep_node)) -> schemas.VMware:
+async def update_vmware_node(node_data: schemas.VMwareUpdate, node: VMwareVM = Depends(dep_node)) -> schemas.VMware:
     """
     Update a VMware node.
     """

gns3server/api/routes/compute/vpcs_nodes.py

@@ -91,15 +91,21 @@ def get_vpcs_node(node: VPCSVM = Depends(dep_node)) -> schemas.VPCS:
     response_model=schemas.VPCS,
     dependencies=[Depends(compute_authentication)]
 )
-def update_vpcs_node(node_data: schemas.VPCSUpdate, node: VPCSVM = Depends(dep_node)) -> schemas.VPCS:
+async def update_vpcs_node(node_data: schemas.VPCSUpdate, node: VPCSVM = Depends(dep_node)) -> schemas.VPCS:
     """
     Update a VPCS node.
     """
 
     node_data = jsonable_encoder(node_data, exclude_unset=True)
-    node.name = node_data.get("name", node.name)
-    node.console = node_data.get("console", node.console)
-    node.console_type = node_data.get("console_type", node.console_type)
+    name = node_data.get("name", node.name)
+    if node.name != name:
+        node.name = name
+    console = node_data.get("console", node.console)
+    if node.console != console:
+        node.console = console
+    console_type = node_data.get("console_type", node.console_type)
+    if node.console_type != console_type:
+        node.console_type = console_type
     node.updated()
     return node.asdict()
 

gns3server/api/routes/controller/controller.py

@@ -221,11 +221,6 @@ async def controller_ws_notifications(
         log.info(f"Client {websocket.client.host}:{websocket.client.port} has disconnected from controller WebSocket")
     except WebSocketException as e:
         log.warning(f"Error while sending to controller event to WebSocket client: {e}")
-    finally:
-        try:
-            await websocket.close()
-        except OSError:
-            pass  # ignore OSError: [Errno 107] Transport endpoint is not connected
 
 
 # @Route.post(

gns3server/api/routes/controller/images.py

@@ -149,8 +149,10 @@ async def upload_image(
     if os.path.commonprefix([base_images_directory, full_path]) != base_images_directory:
         raise ControllerForbiddenError(f"Cannot write image, '{image_path}' is forbidden")
 
-    if await images_repo.get_image(image_path):
-        raise ControllerBadRequestError(f"Image '{image_path}' already exists")
+    image = await images_repo.get_image(image_path)
+    if image:
+        log.warning(f"Image '{image_path}' already exists")
+        return image
 
     try:
         allow_raw_image = Config.instance().settings.Server.allow_raw_images

gns3server/api/routes/controller/projects.py

@@ -305,10 +305,6 @@ async def project_ws_notifications(
     except WebSocketException as e:
         log.warning(f"Error while sending to project event to WebSocket client: {e}")
     finally:
-        try:
-            await websocket.close()
-        except OSError:
-            pass  # ignore OSError: [Errno 107] Transport endpoint is not connected
         if project.auto_close:
             # To avoid trouble with client connecting disconnecting we sleep few seconds before checking
             # if someone else is not connected
@@ -324,6 +320,7 @@ async def export_project(
     include_snapshots: bool = False,
     include_images: bool = False,
     reset_mac_addresses: bool = False,
+    keep_compute_ids: bool = False,
     compression: schemas.ProjectCompression = "zstd",
     compression_level: int = None,
 ) -> StreamingResponse:
@@ -370,6 +367,7 @@ async def export_project(
                         tmpdir,
                         include_snapshots=include_snapshots,
                         include_images=include_images,
+                        keep_compute_ids=keep_compute_ids,
                         reset_mac_addresses=reset_mac_addresses,
                     )
                     async for chunk in zstream:
@@ -432,7 +430,8 @@ async def import_project(
 )
 async def duplicate_project(
         project_data: schemas.ProjectDuplicate,
-        project: Project = Depends(dep_project)
+        project: Project = Depends(dep_project),
+        pools_repo: ResourcePoolsRepository = Depends(get_repository(ResourcePoolsRepository))
 ) -> schemas.Project:
     """
     Duplicate a project.
@@ -444,6 +443,15 @@ async def duplicate_project(
     new_project = await project.duplicate(
         name=project_data.name, reset_mac_addresses=reset_mac_addresses
     )
+
+    # Add the new project in the same resource pools if the duplicated project is in any
+    pool_memberships = await pools_repo.get_resource_memberships(project.id)
+    if pool_memberships:
+        resource_create = schemas.ResourceCreate(resource_id=new_project.id, resource_type="project", name=new_project.name)
+        resource = await pools_repo.create_resource(resource_create)
+        for pool in pool_memberships:
+            await pools_repo.add_resource_to_pool(pool.resource_pool_id, resource)
+
     return new_project.asdict()
 
 

gns3server/api/routes/controller/users.py

@@ -54,7 +54,7 @@ async def login(
 ) -> schemas.Token:
     """
     Default user login method using forms (x-www-form-urlencoded).
-    Example: curl http://host:port/v3/users/login -H "Content-Type: application/x-www-form-urlencoded" -d "username=admin&password=admin"
+    Example: curl -X POST http://host:port/v3/access/users/login -H "Content-Type: application/x-www-form-urlencoded" -d "username=admin&password=admin"
     """
 
     user = await users_repo.authenticate_user(username=form_data.username, password=form_data.password)
@@ -76,7 +76,7 @@ async def authenticate(
 ) -> schemas.Token:
     """
     Alternative authentication method using json.
-    Example: curl http://host:port/v3/users/authenticate -d '{"username": "admin", "password": "admin"}' -H "Content-Type: application/json"
+    Example: curl -X POST http://host:port/v3/access/users/authenticate -d '{"username": "admin", "password": "admin"}' -H "Content-Type: application/json"
     """
 
     user = await users_repo.authenticate_user(username=user_credentials.username, password=user_credentials.password)

gns3server/appliances/almalinux.gns3a

@@ -30,24 +30,24 @@
             "version": "9.2",
             "md5sum": "c5bc76e8c95ac9f810a3482c80a54cc7",
             "filesize": 563347456,
-            "download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
+            "download_url": "https://vault.almalinux.org/9.2/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/9.2/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
         },
         {
             "filename": "AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2",
             "version": "8.8",
             "md5sum": "3958c5fc25770ef63cf97aa5d93f0a0b",
             "filesize": 565444608,
-            "download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
+            "download_url": "https://vault.almalinux.org/8.8/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/8.8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
         },
         {
             "filename": "AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2",
             "version": "8.7",
             "md5sum": "b2b8c7fd3b6869362f3f8ed47549c804",
             "filesize": 566231040,
-            "download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2"
+            "download_url": "https://vault.almalinux.org/8.7/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/8.7/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2"
         },
         {
             "filename": "almalinux-cloud-init-data.iso",

gns3server/appliances/arista-veos.gns3a

@@ -24,9 +24,101 @@
         "hdb_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
-        "kvm": "require"
+        "kvm": "require",
+        "options": "-cpu host"
     },
     "images": [
+        {
+            "filename": "vEOS64-lab-4.32.0F.vmdk",
+            "version": "4.32.0F",
+            "md5sum": "851771260bb18ad3e90fa6956f0c6161",
+            "filesize": 591724544,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS64-lab-4.31.3M.vmdk",
+            "version": "4.31.3M",
+            "md5sum": "7df107da137f4a4e752014d4f0e94cd3",
+            "filesize": 577961984,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS64-lab-4.30.6M.vmdk",
+            "version": "4.30.6M",
+            "md5sum": "19721aace820b9ebf6d7ae6524803cf5",
+            "filesize": 553123840,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS64-lab-4.29.8M.vmdk",
+            "version": "4.29.8M",
+            "md5sum": "131888f74cd63a93894521d40eb4d0b6",
+            "filesize": 548405248,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS64-lab-4.28.11M.vmdk",
+            "version": "4.28.11M",
+            "md5sum": "6cac0e7b04a74ee0dc358327a00accfd",
+            "filesize": 513343488,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS64-lab-4.27.12M.vmdk",
+            "version": "4.27.12M",
+            "md5sum": "34c4f785c7fc054cda8754dd13c0d7c7",
+            "filesize": 496697344,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.32.0F.vmdk",
+            "version": "4.32.0F",
+            "md5sum": "584b901a1249717504050e48f74fb8dd",
+            "filesize": 591396864,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.31.3M.vmdk",
+            "version": "4.31.3M",
+            "md5sum": "a2e130697cdf8547006eebebde6eefca",
+            "filesize": 590086144,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.30.6M.vmdk",
+            "version": "4.30.6M",
+            "md5sum": "a4467648bcfa7b19640af8a4ad3153c6",
+            "filesize": 565968896,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.29.8M.vmdk",
+            "version": "4.29.8M",
+            "md5sum": "1952f6114a4376212c525db9ec8efd5f",
+            "filesize": 558039040,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.28.11M.vmdk",
+            "version": "4.28.11M",
+            "md5sum": "5502df24dfc231c45afb33d6018c16d0",
+            "filesize": 521338880,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.27.12M.vmdk",
+            "version": "4.27.12M",
+            "md5sum": "e08a97e7c1977993f947fedeb4c6ddd5",
+            "filesize": 504299520,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "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"
+        },
         {
             "filename": "vEOS-lab-4.26.2F.vmdk",
             "version": "4.26.2F",
@@ -218,6 +310,90 @@
         }
     ],
     "versions": [
+        {
+            "name": "4.32.0F",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS64-lab-4.32.0F.vmdk"
+            }
+        },
+        {
+            "name": "4.31.3M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS64-lab-4.31.3M.vmdk"
+            }
+        },
+        {
+            "name": "4.30.6M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS64-lab-4.30.6M.vmdk"
+            }
+        },
+        {
+            "name": "4.29.8M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS64-lab-4.29.8M.vmdk"
+            }
+        },
+        {
+            "name": "4.28.11M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS64-lab-4.28.11M.vmdk"
+            }
+        },
+        {
+            "name": "4.27.12M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS64-lab-4.27.12M.vmdk"
+            }
+        },
+        {
+            "name": "4.32.0F",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS-lab-4.32.0F.vmdk"
+            }
+        },
+        {
+            "name": "4.31.3M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS-lab-4.31.3M.vmdk"
+            }
+        },
+        {
+            "name": "4.30.6M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS-lab-4.30.6M.vmdk"
+            }
+        },
+        {
+            "name": "4.29.8M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS-lab-4.29.8M.vmdk"
+            }
+        },
+        {
+            "name": "4.28.11M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS-lab-4.28.11M.vmdk"
+            }
+        },
+        {
+            "name": "4.27.12M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
+                "hdb_disk_image": "vEOS-lab-4.27.12M.vmdk"
+            }
+        },
         {
             "name": "4.26.2F",
             "images": {

gns3server/appliances/aruba-arubaoscx.gns3a

@@ -32,6 +32,27 @@
         "process_priority": "normal"
     },
     "images": [
+        {
+            "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 +139,24 @@
         }
     ],
     "versions": [
+        {
+            "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.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, passwd 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/bird.gns3a

@@ -11,7 +11,7 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Configure interfaces in /opt/bootlocal.sh, BIRD configuration is done in /usr/local/etc/bird",
+    "usage": "\n*** BIRD v1 is end-of-life ***\nPlease use the BIRD2 appliance.\n\nConfigure interfaces in /opt/bootlocal.sh, BIRD configuration is done in /usr/local/etc/bird",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 4,

gns3server/appliances/bird2.gns3a

@@ -23,6 +23,14 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "bird2-debian-2.14.qcow2",
+            "version": "2.14",
+            "md5sum": "029cf1756201ee79497c169502b08b88",
+            "filesize": 303717376,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/bird2-debian-2.14.qcow2"
+        },
         {
             "filename": "bird2-debian-2.0.12.qcow2",
             "version": "2.0.12",
@@ -33,6 +41,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "2.14",
+            "images": {
+                "hda_disk_image": "bird2-debian-2.14.qcow2"
+            }
+        },
         {
             "name": "2.0.12",
             "images": {

gns3server/appliances/cisco-asav.gns3a

@@ -26,6 +26,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "asav9-18-2.qcow2",
+            "version": "9.18.2 CML",
+            "md5sum": "6f10fe106edfad9163625770a47a6b73",
+            "filesize": 340262912,
+            "download_url": "https://learningnetworkstore.cisco.com/cisco-modeling-labs-personal/cisco-modeling-labs-personal/CML-PERSONAL.html"
+        },
         {
             "filename": "asav9-16-2.qcow2",
             "version": "9.16.2 CML",
@@ -119,6 +126,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.18.2 CML",
+            "images": {
+                "hda_disk_image": "asav9-18-2.qcow2"
+            }
+        },
         {
             "name": "9.16.2 CML",
             "images": {

gns3server/appliances/cisco-c8000v.gns3a

@@ -24,6 +24,20 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "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/Cupertino-17.9.1a"
+        },
         {
             "filename": "c8000v-universalk9_8G_serial.17.06.05.qcow2",
             "version": "17.06.05 8G",
@@ -54,6 +68,18 @@
         }
     ],
     "versions": [
+        {
+            "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"
+            }
+        },
         {
             "name": "17.06.05 8G",
             "images": {

gns3server/appliances/cisco-cat9k.gns3a

@@ -12,20 +12,27 @@
     "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

@@ -24,6 +24,27 @@
         "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/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",
             "version": "16.12.3",
@@ -160,6 +181,24 @@
     ],
     "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

@@ -32,6 +32,13 @@
             "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.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",
             "version": "15.9(3)M6",
@@ -97,6 +104,13 @@
         }
     ],
     "versions": [
+        {
+            "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-iosxrv9k.gns3a

@@ -26,6 +26,13 @@
         "options": "-smp 4 -cpu host"
     },
     "images": [
+        {
+            "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"
+        },
         {
             "filename": "xrv9k-fullk9-x-7.1.1.qcow2",
             "version": "7.1.1",
@@ -105,6 +112,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.7.1",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x-7.7.1.qcow2"
+            }
+        },
         {
             "name": "7.1.1",
             "images": {

gns3server/appliances/cisco-iou-l2.gns3a

@@ -18,6 +18,12 @@
         "startup_config": "iou_l2_base_startup-config.txt"
     },
     "images": [
+        {
+            "filename": "x86_64_crb_linux_l2-adventerprisek9-ms.bin",
+            "version": "17.12.1",
+            "md5sum": "2b5055e4cef8fd257416d74a94adb626",
+            "filesize": 240355720
+        },
         {
             "filename": "i86bi-linux-l2-ipbasek9-15.1g.bin",
             "version": "15.1g",
@@ -38,6 +44,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "17.12.1",
+            "images": {
+                "image": "x86_64_crb_linux_l2-adventerprisek9-ms.bin"
+            }
+        },
         {
             "name": "15.1g",
             "images": {

gns3server/appliances/cisco-iou-l3.gns3a

@@ -18,6 +18,12 @@
         "startup_config": "iou_l3_base_startup-config.txt"
     },
     "images": [
+        {
+            "filename": "x86_64_crb_linux-adventerprisek9-ms.bin",
+            "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 +44,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "17.12.1",
+            "images": {
+                "image": "x86_64_crb_linux-adventerprisek9-ms.bin"
+            }
+        },
         {
             "name": "15.7(3)M2",
             "images": {

gns3server/appliances/cisco-nxosv9k.gns3a

@@ -26,6 +26,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "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)"
+        },
         {
             "filename": "nexus9500v64.10.1.1.qcow2",
             "version": "9500v 10.1.1",
@@ -40,6 +47,34 @@
             "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",
@@ -198,6 +233,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "9300v 10.3.1.F",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "nexus9300v64.10.3.1.F.qcow2"
+            }
+        },
         {
             "name": "9500v 10.1.1",
             "images": {
@@ -212,6 +254,34 @@
                 "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": {

gns3server/appliances/cisco-vWLC.gns3a

@@ -29,6 +29,20 @@
     },
     "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

@@ -24,12 +24,28 @@
     },
     "images": [
         {
-            "filename": "debian-12.2.qcow2",
-            "version": "12.2",
-            "md5sum": "adf7716ec4a4e4e9e5ccfc7a1d7bd103",
-            "filesize": 286654464,
+            "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.2.qcow2"
+            "direct_download_url": "https://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/debian-12.6.qcow2"
+        },
+        {
+            "filename": "debian-12.4.qcow2",
+            "version": "12.4",
+            "md5sum": "adcf7fdc25e10b3d2d9e2ef91168bffd",
+            "filesize": 286179840,
+            "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",
@@ -42,9 +58,21 @@
     ],
     "versions": [
         {
-            "name": "12.2",
+            "name": "12.6",
             "images": {
-                "hda_disk_image": "debian-12.2.qcow2"
+                "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"
             }
         },
         {

gns3server/appliances/dell-ftos.gns3a

@@ -11,26 +11,36 @@
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Make sure the Boot priority of the configuration template is HDD or CD.\n\nAbort the BCM process and format the flash after first boot by entering these commands:\nen\nformat flash:\n\nSometimes the flash device is not available after boot.",
+    "usage": "Make sure the Boot priority of the configuration template is HDD or CD.\n\nFor FTOS 9.8, switch to vnc console, start the device, abort the BMP process and format the flash after first boot by entering these commands:\nen\nformat flash:\n\nSometimes the flash device is not available after boot.",
     "first_port_name": "Management0/0",
     "port_name_format": "fortyGigE0/{0}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 6,
-        "ram": 512,
+        "ram": 1024,
         "hda_disk_interface": "ide",
         "arch": "i386",
-        "console_type": "vnc",
+        "console_type": "telnet",
         "boot_priority": "cd",
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "FTOS-SI-9.13.0.0.iso",
+            "version": "9.13.0",
+            "md5sum": "8418049e451c76e7b85e36eca0a0a730",
+            "filesize": 131278848,
+            "download_url": "https://www.dell.com/support/kbdoc/en-us/000184062/ftos-for-s-series-os-emulator-current-release-evaluation-version",
+            "direct_download_url": "https://downloads.dell.com/translatedpdf/force10/os9/FTOS-SI-9.13.0.0.zip",
+            "compression": "zip"
+        },
         {
             "filename": "FTOS-SI-9.8.0.0.iso",
             "version": "9.8.0",
             "md5sum": "b9b50eda0a73407dc381792ff7975e24",
             "filesize": 108115968,
-            "download_url": "https://www.force10networks.com/CSPortal20/Software/SSeriesDownloads.aspx",
+            "download_url": "https://www.dell.com/support/kbdoc/en-us/000184062/ftos-for-s-series-os-emulator-current-release-evaluation-version",
+            "direct_download_url": "https://downloads.dell.com/translatedpdf/force10/os9/FTOS-SI-9.8.0.0.zip",
             "compression": "zip"
         },
         {
@@ -43,6 +53,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.13.0",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "FTOS-SI-9.13.0.0.iso"
+            }
+        },
         {
             "name": "9.8.0",
             "images": {

gns3server/appliances/exos.gns3a

@@ -26,163 +26,25 @@
         "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_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.6.3.126",
             "images": {
-                "hda_disk_image": "EXOS-VM_v32.1.1.6.qcow2"
-            }
-        },
-        {
-            "name": "31.7.1.4",
-            "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,14 @@
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "Fedora-Cloud-Base-39-1.5.x86_64.qcow2",
+            "version": "39-1.5",
+            "md5sum": "800a10df2d369891ed65900bcacacd47",
+            "filesize": 544604160,
+            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/39/Cloud/x86_64/images",
+            "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/39/Cloud/x86_64/images/Fedora-Cloud-Base-39-1.5.x86_64.qcow2"
+        },
         {
             "filename": "Fedora-Cloud-Base-38-1.6.x86_64.qcow2",
             "version": "38-1.6",
@@ -34,30 +42,6 @@
             "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images",
             "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images/Fedora-Cloud-Base-38-1.6.x86_64.qcow2"
         },
-        {
-            "filename": "Fedora-Cloud-Base-37-1.7.x86_64.qcow2",
-            "version": "37-1.7",
-            "md5sum": "36f7b464b6ab46ad97c001b539495e90",
-            "filesize": 492830720,
-            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images",
-            "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images/Fedora-Cloud-Base-37-1.7.x86_64.qcow2"
-        },
-        {
-            "filename": "Fedora-Cloud-Base-36-1.5.x86_64.qcow2",
-            "version": "36-1.5",
-            "md5sum": "7f7cdad25b77f232078bf454c39529d3",
-            "filesize": 448266240,
-            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images",
-            "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2"
-        },
-        {
-            "filename": "Fedora-Cloud-Base-35-1.2.x86_64.qcow2",
-            "version": "35-1.2",
-            "md5sum": "cfa9cdcfb946e5f4cf9dd4d7906008d0",
-            "filesize": 376897536,
-            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images",
-            "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
-        },
         {
             "filename": "fedora-cloud-init-data.iso",
             "version": "1.0",
@@ -68,33 +52,19 @@
         }
     ],
     "versions": [
+        {
+            "name": "39-1.5",
+            "images": {
+                "hda_disk_image": "Fedora-Cloud-Base-39-1.5.x86_64.qcow2",
+                "cdrom_image": "fedora-cloud-init-data.iso"
+            }
+        },
         {
             "name": "38-1.6",
             "images": {
                 "hda_disk_image": "Fedora-Cloud-Base-38-1.6.x86_64.qcow2",
                 "cdrom_image": "fedora-cloud-init-data.iso"
             }
-        },
-        {
-            "name": "37-1.7",
-            "images": {
-                "hda_disk_image": "Fedora-Cloud-Base-37-1.7.x86_64.qcow2",
-                "cdrom_image": "fedora-cloud-init-data.iso"
-            }
-        },
-        {
-            "name": "36-1.5",
-            "images": {
-                "hda_disk_image": "Fedora-Cloud-Base-36-1.5.x86_64.qcow2",
-                "cdrom_image": "fedora-cloud-init-data.iso"
-            }
-        },
-        {
-            "name": "35-1.2",
-            "images": {
-                "hda_disk_image": "Fedora-Cloud-Base-35-1.2.x86_64.qcow2",
-                "cdrom_image": "fedora-cloud-init-data.iso"
-            }
         }
     ]
 }

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,20 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "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",
+            "md5sum": "33b2938e19a6cb61d4d64e6998a54d23",
+            "filesize": 480096256,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2",
             "version": "7.4.1",
@@ -36,6 +50,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",
@@ -57,6 +78,20 @@
             "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",
+            "md5sum": "ae7ff37d00d0b518e9982a0785665fc2",
+            "filesize": 349257728,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2",
             "version": "7.0.9",
@@ -78,6 +113,13 @@
             "filesize": 334184448,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAZ_VM64_KVM-v6.4.14-build2660-FORTINET.out.kvm.qcow2",
+            "version": "6.4.14",
+            "md5sum": "1629d76776c9d625faee0304b5840c02",
+            "filesize": 300683264,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2",
             "version": "6.4.12",
@@ -235,6 +277,20 @@
         }
     ],
     "versions": [
+        {
+            "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": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.4.2-build2397-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.4.1",
             "images": {
@@ -242,6 +298,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": {
@@ -263,6 +326,20 @@
                 "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": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.0.11-build0595-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.9",
             "images": {
@@ -284,6 +361,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.4.14",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6.4.14-build2660-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.4.12",
             "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,20 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "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",
+            "md5sum": "e7517095c91dce1a76a9bcf114b5fa15",
+            "filesize": 100728832,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.4.1.F-build2463-FORTINET.out.kvm.qcow2",
             "version": "7.4.1",
@@ -35,6 +49,20 @@
             "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",
+            "md5sum": "752b56844e464b0b135e57f72681c288",
+            "filesize": 102760448,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.2.6.F-build1575-FORTINET.out.kvm.qcow2",
             "version": "7.2.6",
@@ -63,6 +91,20 @@
             "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",
+            "md5sum": "20c855889e1117902bcf448b30746d30",
+            "filesize": 77398016,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.0.13.M-build0566-FORTINET.out.kvm.qcow2",
             "version": "7.0.13",
@@ -91,6 +133,13 @@
             "filesize": 77135872,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FGT_VM64_KVM-v6.4.15.M-build2095-FORTINET.out.kvm.qcow2",
+            "version": "6.4.15",
+            "md5sum": "a0306a3905877de654dab7e1bb67089e",
+            "filesize": 81592320,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v6.4.14.M-build2093-FORTINET.out.kvm.qcow2",
             "version": "6.4.14",
@@ -339,6 +388,20 @@
         }
     ],
     "versions": [
+        {
+            "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": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.4.3.F-build2573-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.4.1",
             "images": {
@@ -346,6 +409,20 @@
                 "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": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.2.7.M-build1577-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.6",
             "images": {
@@ -374,6 +451,20 @@
                 "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": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.0.14.M-build0601-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.13",
             "images": {
@@ -402,6 +493,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.4.15",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6.4.15.M-build2095-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.4.14",
             "images": {

gns3server/appliances/fortimanager.gns3a

@@ -13,7 +13,7 @@
     "status": "stable",
     "maintainer": "Ean Towne",
     "maintainer_email": "ean.fortinet@gmail.com",
-    "usage": "Default username is admin, no password is set.\n\n- Versions lower than 7.0.x require less CPU/RAM",
+    "usage": "Default username is admin, no password is set.\n\n- Versions lower than 7.0.x require less CPU/RAM\n7.4.x may require 16GB RAM.",
     "symbol": "fortinet.svg",
     "port_name_format": "Port{port1}",
     "qemu": {
@@ -29,6 +29,20 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FMG_VM64_KVM-v7.4.3-build2487-FORTINET.out.kvm.qcow2",
+            "version": "7.4.23",
+            "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",
+            "md5sum": "36371fbf06210ded57c00b2ff290f2c5",
+            "filesize": 322514944,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2",
             "version": "7.4.1",
@@ -36,6 +50,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",
@@ -57,6 +78,20 @@
             "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",
+            "md5sum": "7b166222136e26190159f37cccbaab6e",
+            "filesize": 249360384,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2",
             "version": "7.0.9",
@@ -78,6 +113,13 @@
             "filesize": 237535232,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FMG_VM64_KVM-v6.4.14-build2660-FORTINET.out.kvm.qcow2",
+            "version": "6.4.14",
+            "md5sum": "0fe56e363b166c07b710bde795e36049",
+            "filesize": 219430912,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2",
             "version": "6.4.12",
@@ -235,6 +277,20 @@
         }
     ],
     "versions": [
+        {
+            "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": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.4.2-build2397-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.4.1",
             "images": {
@@ -242,6 +298,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": {
@@ -263,6 +326,20 @@
                 "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": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.0.11-build0595-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.9",
             "images": {
@@ -284,6 +361,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.4.14",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6.4.14-build2660-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.4.12",
             "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/huawei-ne40e.gns3a

@@ -7,16 +7,65 @@
     "vendor_url": "https://www.huawei.com",
     "product_name": "HuaWei NE40E",
     "product_url": "https://e.huawei.com/en/products/enterprise-networking/routers/ne/ne40e",
-    "registry_version": 4,
+    "registry_version": 6,
     "status": "experimental",
     "availability": "service-contract",
     "maintainer": "none",
     "maintainer_email": "",
-    "first_port_name": "eth0",
     "port_name_format": "Ethernet1/0/{0}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 12,
+        "custom_adapters": [
+                {
+                    "adapter_number": 0,
+                    "port_name": "Gi0/0/0"
+                },
+                {
+                    "adapter_number": 1,
+                    "port_name": "Mgmt0/0"
+                },
+                {
+                    "adapter_number": 2,
+                    "port_name": "Ethernet1/0/0"
+                },
+                {
+                    "adapter_number": 3,
+                    "port_name": "Ethernet1/0/1"
+                },
+                {
+                    "adapter_number": 4,
+                    "port_name": "Ethernet1/0/2"
+                },
+                {
+                    "adapter_number": 5,
+                    "port_name": "Ethernet1/0/3"
+                },
+                {
+                    "adapter_number": 6,
+                    "port_name": "Ethernet1/0/4"
+                },
+                {
+                    "adapter_number": 7,
+                    "port_name": "Ethernet1/0/5"
+                },
+                {
+                    "adapter_number": 8,
+                    "port_name": "Ethernet1/0/6"
+                },
+                {
+                    "adapter_number": 9,
+                    "port_name": "Ethernet1/0/7"
+                },
+                {
+                    "adapter_number": 10,
+                    "port_name": "Ethernet1/0/8"
+                },
+                {
+                    "adapter_number": 11,
+                    "port_name": "Ethernet1/0/9"
+                }
+        ],
         "ram": 2048,
         "cpus": 2,
         "hda_disk_interface": "ide",

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-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/mikrotik-rb1100ahx4-dude-edition.gns3a

@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
     "product_name": "MikroTik RouterBOARD 1100AHx4 Dude Edition",
     "product_url": "http://www.mikrotik.com/download",
-    "registry_version": 5,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Azorian Solutions",
     "maintainer_email": "help@azorian.solutions",

gns3server/appliances/mikrotik-rb450g.gns3a

@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
     "product_name": "MikroTik RouterBOARD 450G",
     "product_url": "http://www.mikrotik.com/download",
-    "registry_version": 5,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Azorian Solutions",
     "maintainer_email": "help@azorian.solutions",

gns3server/appliances/mikrotik-rb450gx4.gns3a

@@ -8,7 +8,7 @@
     "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
     "product_name": "MikroTik RouterBOARD 450Gx4",
     "product_url": "http://www.mikrotik.com/download",
-    "registry_version": 5,
+    "registry_version": 4,
     "status": "stable",
     "maintainer": "Azorian Solutions",
     "maintainer_email": "help@azorian.solutions",

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/ostinato.gns3a

@@ -30,6 +30,13 @@
         "options": "-vga std -usbdevice tablet"
     },
     "images": [
+        {
+            "version": "1.3.0",
+            "filename": "ostinatostd-1.3.0-1.qcow2",
+            "filesize": 173735936,
+            "md5sum": "ff25fed989c43aeac84bf0d542ad43ba",
+            "download_url": "https://ostinato.org/pricing/gns3"
+        },
         {
             "filename": "ostinatostd-1.2.0-1.qcow2",
             "version": "1.2.0",
@@ -46,6 +53,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "1.3.0",
+            "images": {
+                "hda_disk_image": "ostinatostd-1.3.0-1.qcow2"
+            }
+        },
         {
             "name": "1.2.0",
             "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",
@@ -127,6 +141,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": {

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

@@ -11,9 +11,9 @@
     "registry_version": 4,
     "status": "stable",
     "availability": "service-contract",
-    "maintainer": "Neyder Achahuanco",
-    "maintainer_email": "neyder@neyder.net",
-    "usage": "You should download Red Hat Enterprise Linux KVM Guest Image from https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.2/x86_64/product-software attach/customize cloud-init.iso and start.\nusername: cloud-user\npassword: redhat",
+    "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",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 1,
@@ -26,6 +26,13 @@
         "options": "-cpu host -nographic"
     },
     "images": [
+        {
+            "filename": "rhel-9.3-x86_64-kvm.qcow2",
+            "version": "9.3",
+            "md5sum": "409d8d15f5177db2617b0e3e02139b5c",
+            "filesize": 858193920,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.3/x86_64/product-software"
+        },
         {
             "filename": "rhel-9.2-x86_64-kvm.qcow2",
             "version": "9.2",
@@ -112,6 +119,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.3",
+            "images": {
+                "hda_disk_image": "rhel-9.3-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
         {
             "name": "9.2",
             "images": {

gns3server/appliances/rockylinux.gns3a

@@ -26,6 +26,14 @@
         "options": "-nographic -cpu host"
     },
     "images": [
+        {
+            "filename": "Rocky-9-GenericCloud-Base-9.3-20231113.0.x86_64.qcow2",
+            "version": "9.3",
+            "md5sum": "48cdeb033364af5909e15ee48d0e144d",
+            "filesize": 1083965440,
+            "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.3-20231113.0.x86_64.qcow2"
+        },
         {
             "filename": "Rocky-9-GenericCloud-Base-9.2-20230513.0.x86_64.qcow2",
             "version": "9.2",
@@ -34,6 +42,14 @@
             "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.2-20230513.0.x86_64.qcow2"
         },
+        {
+            "filename": "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2",
+            "version": "8.9",
+            "md5sum": "50c44d8d9c4df43694372c13768f114c",
+            "filesize": 1971978240,
+            "download_url": "https://download.rockylinux.org/pub/rocky/8/images/x86_64/",
+            "direct_download_url": "https://download.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2"
+        },
         {
             "filename": "Rocky-8-GenericCloud-Base-8.8-20230518.0.x86_64.qcow2",
             "version": "8.8",
@@ -52,6 +68,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.3",
+            "images": {
+                "hda_disk_image": "Rocky-9-GenericCloud-Base-9.3-20231113.0.x86_64.qcow2",
+                "cdrom_image": "rocky-cloud-init-data.iso"
+            }
+        },
         {
             "name": "9.2",
             "images": {
@@ -59,6 +82,13 @@
                 "cdrom_image": "rocky-cloud-init-data.iso"
             }
         },
+        {
+            "name": "8.9",
+            "images": {
+                "hda_disk_image": "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2",
+                "cdrom_image": "rocky-cloud-init-data.iso"
+            }
+        },
         {
             "name": "8.8",
             "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/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-arm64.img",
-            "version": "Ubuntu 23.04 (Lunar Lobster)",
-            "md5sum": "35fa3b31b65717af6f0520a769aac8c0",
-            "filesize": 786432000,
-            "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-arm64.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-arm64.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",
@@ -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",
@@ -26,6 +26,20 @@
     },
     "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",
@@ -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,178 @@
 {
     "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.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.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

@@ -742,6 +742,7 @@ class BaseNode:
         path = shutil.which(self._manager.config.settings.Server.ubridge_path)
         return path
 
+    @locking
     async def _ubridge_send(self, command):
         """
         Sends a command to uBridge hypervisor.

gns3server/compute/docker/__init__.py

@@ -28,6 +28,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
@@ -87,7 +88,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():
@@ -95,8 +96,13 @@ class Docker(BaseManager):
         Get the Docker resources storage directory
         """
 
+        resources_path = Config.instance().settings.Server.resources_path
+        if not resources_path:
             appname = vendor = "GNS3"
-        docker_resources_dir = os.path.join(platformdirs.user_data_dir(appname, vendor, roaming=True), "docker", "resources")
+            resources_path = platformdirs.user_data_dir(appname, vendor, roaming=True)
+        else:
+            resources_path = os.path.expanduser(resources_path)
+        docker_resources_dir = os.path.join(resources_path, "docker")
         os.makedirs(docker_resources_dir, exist_ok=True)
         return docker_resources_dir
 
@@ -193,8 +199,8 @@ class Docker(BaseManager):
         if timeout is None:
             timeout = 60 * 60 * 24 * 31  # One month timeout
 
-        if path == "version":
-            url = "http://docker/v1.12/" + path  # API of docker v1.0
+        if path == 'version':
+            url = "http://docker/v1.24/" + path
         else:
             url = "http://docker/v" + DOCKER_MINIMUM_API_VERSION + "/" + path
         try:

gns3server/compute/docker/docker_vm.py

@@ -34,6 +34,7 @@ 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.hostname import is_rfc1123_hostname_valid
+from gns3server.utils import macaddress_to_int, int_to_macaddress
 
 from gns3server.compute.ubridge.ubridge_error import UbridgeError, UbridgeNamespaceError
 from ..base_node import BaseNode
@@ -78,6 +79,7 @@ class DockerVM(BaseNode):
         aux=None,
         start_command=None,
         adapters=None,
+        mac_address="",
         environment=None,
         console_type="telnet",
         aux_type="none",
@@ -130,6 +132,8 @@ class DockerVM(BaseNode):
         else:
             self.adapters = adapters
 
+        self.mac_address = mac_address
+
         log.debug(
             "{module}: {name} [{image}] initialized.".format(
                 module=self.manager.module_name, name=self.name, image=self._image
@@ -145,6 +149,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,
@@ -190,6 +195,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
@@ -429,6 +464,7 @@ class DockerVM(BaseNode):
                 "Mounts": self._mount_binds(image_infos),
                 "Memory": self._memory * (1024 * 1024),  # convert memory to bytes
                 "NanoCpus": int(self._cpus * 1e9),  # convert cpus to nano cpus
+                "UsernsMode": "host"
             },
             "Volumes": {},
             "Env": ["container=docker"],  # Systemd compliant: https://github.com/GNS3/gns3-server/issues/573
@@ -506,6 +542,10 @@ class DockerVM(BaseNode):
         result = await self.manager.query("POST", "containers/create", data=params)
         self._cid = result["Id"]
         log.info(f"Docker container '{self._name}' [{self._id}] created")
+        if self._cpus > 0:
+            log.info(f"CPU limit set to {self._cpus} CPUs")
+        if self._memory > 0:
+            log.info(f"Memory limit set to {self._memory} MB")
         return True
 
     def _format_env(self, variables, env):
@@ -571,6 +611,9 @@ 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", f"containers/{self._cid}/start")
@@ -792,7 +835,10 @@ class DockerVM(BaseNode):
         """
 
         # resize the container TTY.
+        try:
             await self._manager.query("POST", f"containers/{self._cid}/resize?h={rows}&w={columns}")
+        except DockerError as e:
+            log.warning(f"Could not resize the container TTY: {e}")
 
     async def _start_console(self):
         """
@@ -833,9 +879,7 @@ class DockerVM(BaseNode):
             f"containers/{self._cid}/attach/ws?stream=1&stdin=1&stdout=1&stderr=1"
         )
         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):
@@ -858,13 +902,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()
 
@@ -908,6 +953,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()
 
@@ -1049,7 +1097,20 @@ class DockerVM(BaseNode):
                 adapter_number=adapter_number, hostif=adapter.host_ifc
             )
         )
-        log.debug("Move container %s adapter %s to namespace %s", self.name, adapter.host_ifc, self._namespace)
+
+        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(f"Could not set MAC address {mac_address} on interface {adapter.host_ifc}")
+
+
+        log.debug(f"Move container {self.name} adapter {adapter.host_ifc} to namespace {self._namespace}")
         try:
             await self._ubridge_send(
                 "docker move_to_ns {ifc} {ns} eth{adapter}".format(
@@ -1058,6 +1119,8 @@ class DockerVM(BaseNode):
             )
         except UbridgeError as e:
             raise UbridgeNamespaceError(e)
+        else:
+            log.info(f"Created adapter {adapter_number} with MAC address {mac_address} in namespace {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/dynamips/__init__.py

@@ -252,6 +252,9 @@ class Dynamips(BaseManager):
         # look for Dynamips
         dynamips_path = self.config.settings.Dynamips.dynamips_path
         if not os.path.isabs(dynamips_path):
+            if sys.platform.startswith("win") and hasattr(sys, "frozen"):
+                dynamips_dir = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(sys.executable)), "dynamips"))
+                os.environ["PATH"] = os.pathsep.join(dynamips_dir) + os.pathsep + os.environ.get("PATH", "")
             dynamips_path = shutil.which(dynamips_path)
 
         if not dynamips_path:

gns3server/compute/dynamips/nodes/router.py

@@ -1030,6 +1030,26 @@ class Router(BaseNode):
         self.aux = aux
         await self._hypervisor.send(f'vm set_aux_tcp_port "{self._name}" {aux}')
 
+    async def set_aux_type(self, aux_type):
+        """
+        Sets the aux type.
+
+        :param aux_type: auxiliary console type
+        """
+
+        if self.aux_type != aux_type:
+            status = await self.get_status()
+            if status == "running":
+                raise DynamipsError('"{name}" must be stopped to change the auxiliary console type to {aux_type}'.format(
+                    name=self._name,
+                    aux_type=aux_type)
+                )
+
+        self.aux_type = aux_type
+
+        if self._aux and aux_type == "telnet":
+            await self._hypervisor.send(f'vm set_aux_tcp_port "{self._name}" {self._aux}')
+
     async def reset_console(self):
         """
         Reset console

gns3server/compute/iou/iou_vm.py

@@ -661,6 +661,7 @@ class IOUVM(BaseNode):
             self._telnet_server.close()
             await self._telnet_server.wait_closed()
             self._telnet_server = None
+        if self.is_running():
             await self.start_console()
 
     @locking

gns3server/compute/notification_manager.py

@@ -15,7 +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 asyncio
 from contextlib import contextmanager
 from gns3server.utils.notification_queue import NotificationQueue
 
@@ -54,7 +54,7 @@ class NotificationManager:
         """
 
         for listener in self._listeners:
-            listener.put_nowait((action, event, kwargs))
+            asyncio.get_running_loop().call_soon_threadsafe(listener.put_nowait, (action, event, kwargs))
 
     @staticmethod
     def reset():

gns3server/compute/qemu/__init__.py

@@ -149,13 +149,20 @@ class Qemu(BaseManager):
                             for arch in archs:
                                 if f.endswith(arch) or f.endswith(f"{arch}.exe") or f.endswith(f"{arch}w.exe"):
                                     qemu_path = os.path.join(path, f)
+                                    try:
                                         version = await Qemu.get_qemu_version(qemu_path)
+                                    except QemuError as e:
+                                        log.warning(str(e))
+                                        continue
                                     qemus.append({"path": qemu_path, "version": version})
                         else:
                             qemu_path = os.path.join(path, f)
+                            try:
                                 version = await Qemu.get_qemu_version(qemu_path)
+                            except QemuError as e:
+                                log.warning(str(e))
+                                continue
                             qemus.append({"path": qemu_path, "version": version})
-
             except OSError:
                 continue
 

gns3server/compute/qemu/qemu_vm.py

@@ -45,7 +45,7 @@ from ..nios.nio_tap import NIOTAP
 from ..base_node import BaseNode
 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
 from ...utils.hostname import is_rfc1123_hostname_valid
 
 from gns3server.schemas.compute.qemu_nodes import Qemu, QemuPlatform
@@ -54,6 +54,12 @@ 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"
@@ -124,6 +130,8 @@ class QemuVM(BaseNode):
             except QemuError:
                 # If the binary is not found for topologies 1.4 and later
                 # search via the platform otherwise use the binary name
+                log.warning(f"Could not find the QEMU binary {qemu_path} on this system, "
+                            f"trying to find one using platform {platform}")
                 if platform:
                     self.platform = platform
                 else:
@@ -242,7 +250,7 @@ class QemuVM(BaseNode):
         if qemu_path and os.pathsep not in qemu_path:
             new_qemu_path = shutil.which(qemu_path, path=os.pathsep.join(self._manager.paths_list()))
             if new_qemu_path is None:
-                raise QemuError(f"QEMU binary path {qemu_path} is not found in the path")
+                raise QemuError(f"QEMU binary '{qemu_path}' cannot be found on the system")
             qemu_path = new_qemu_path
 
         self._check_qemu_path(qemu_path)
@@ -289,6 +297,7 @@ class QemuVM(BaseNode):
     def platform(self, platform):
 
         self._platform = platform
+        log.info(f"QEMU VM '{self._name}' [{self._id}] has set the platform {platform}")
         self.qemu_path = f"qemu-system-{platform}"
 
     def _disk_setter(self, variable, value):
@@ -1852,14 +1861,17 @@ class QemuVM(BaseNode):
         if port:
             console_host = self._manager.port_manager.console_host
             if console_host == "0.0.0.0":
-                if socket.has_ipv6:
+                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 = "::"
-                else:
-                    raise QemuError("IPv6 must be enabled in order to use the SPICE console")
-            return ["-spice", f"addr={console_host},port={port},disable-ticketing", "-vga", "qxl"]
+                except OSError as e:
+                    raise QemuError("Could not check if IPv6 is enabled: {}".format(e))
+            return ["-spice",
+                    f"addr={console_host},port={port},disable-ticketing",
+                    "-vga", "qxl"]
         else:
             return []
 
@@ -2145,11 +2157,6 @@ class QemuVM(BaseNode):
                 continue
 
             interface = getattr(self, f"hd{drive}_disk_interface")
-            # 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, f"hd{drive}_disk_interface", interface)
-
             disk_name = f"hd{drive}"
             if not os.path.isfile(disk_image) or not os.path.exists(disk_image):
                 if os.path.islink(disk_image):
@@ -2637,9 +2644,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(f"Invalid additional options: {additional_options} error {e}")
+            allow_unsafe_options = self.manager.config.settings.Qemu.allow_unsafe_options
+            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'])
         return command
 
     def asdict(self):

gns3server/compute/vpcs/vpcs_vm.py

@@ -142,6 +142,9 @@ class VPCSVM(BaseNode):
 
         vpcs_path = self._manager.config.settings.VPCS.vpcs_path
         if not os.path.isabs(vpcs_path):
+            if sys.platform.startswith("win") and hasattr(sys, "frozen"):
+                vpcs_dir = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(sys.executable)), "vpcs"))
+                os.environ["PATH"] = os.pathsep.join(vpcs_dir) + os.pathsep + os.environ.get("PATH", "")
             vpcs_path = shutil.which(vpcs_path)
         return vpcs_path
 

gns3server/config_samples/gns3_server.conf

@@ -34,7 +34,7 @@ enable_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
 
 ; Additional paths to look for images
@@ -43,15 +43,20 @@ additional_images_paths = /opt/images;/mnt/disk1/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 custom configs are stored
 configs_path = /home/gns3/GNS3/configs
 
+; 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
+
 ; Default symbol theme
 ; Currently available themes are "Classic", Affinity-square-blue", "Affinity-square-red"
 ; "Affinity-square-gray", "Affinity-circle-blue", "Affinity-circle-red" and "Affinity-circle-gray"
@@ -102,6 +107,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
 
@@ -148,3 +156,5 @@ monitor_host = 127.0.0.1
 enable_hardware_acceleration = True
 ; Require hardware acceleration in order to start VMs
 require_hardware_acceleration = False
+; Allow unsafe additional command line options
+allow_unsafe_options = False

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

@@ -30,7 +30,7 @@ except ImportError:
 
 
 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
@@ -91,7 +91,7 @@ class Controller:
         if server_config.enable_ssl:
             self._ssl_context = self._create_ssl_context(server_config)
 
-        protocol = server_config.protocol
+        protocol = server_config.protocol.value
         if self._ssl_context and protocol != "https":
             log.warning(f"Protocol changed to 'https' for local compute because SSL is enabled")
             protocol = "https"
@@ -270,13 +270,18 @@ class Controller:
                 log.error(f"Cannot read IOU license file '{iourc_path}': {e}")
         self._iou_license_settings["license_check"] = iou_config.license_check
 
+        # install the built-in appliances if needed
+        if Config.instance().settings.Server.install_builtin_appliances:
             previous_version = controller_vars.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(self._appliance_manager.builtin_appliances_path()):
+            elif not os.listdir(builtin_appliances_path):
                 self._appliance_manager.install_builtin_appliances()
+            else:
+                log.info(f"Built-in appliances are installed in '{builtin_appliances_path}'")
 
         self._appliance_manager.appliances_etag = controller_vars.get("appliances_etag")
         self._appliance_manager.load_appliances()
@@ -303,12 +308,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):
@@ -317,12 +331,12 @@ class Controller:
         else:
             for entry in importlib_resources.files('gns3server').joinpath(resource_name).iterdir():
                 full_path = os.path.join(dst_path, entry.name)
-                if not os.path.exists(full_path):
-                    if entry.is_file():
+                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():
                     os.makedirs(full_path, exist_ok=True)
+                    Controller.install_resource_files(full_path, os.path.join(resource_name, entry.name))
 
     def _install_base_configs(self):
         """
@@ -333,7 +347,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}")
 
@@ -346,7 +360,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

@@ -95,15 +95,18 @@ 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
         """
 
+        resources_path = Config.instance().settings.Server.resources_path
+        if not resources_path:
             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 = platformdirs.user_data_dir(appname, vendor, roaming=True)
+        else:
+            resources_path = os.path.expanduser(resources_path)
+        appliances_dir = os.path.join(resources_path, "appliances")
         os.makedirs(appliances_dir, exist_ok=True)
         return appliances_dir
 
@@ -112,7 +115,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/export_project.py

@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import sys
 import json
 import asyncio
 import aiofiles
@@ -39,7 +40,7 @@ async def export_project(
     temporary_dir,
     include_images=False,
     include_snapshots=False,
-    keep_compute_id=False,
+    keep_compute_ids=False,
     allow_all_nodes=False,
     reset_mac_addresses=False,
 ):
@@ -54,9 +55,9 @@ async def export_project(
     :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 by 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
@@ -77,7 +78,7 @@ async def export_project(
                 os.path.join(project._path, file),
                 zstream,
                 include_images,
-                keep_compute_id,
+                keep_compute_ids,
                 allow_all_nodes,
                 temporary_dir,
                 reset_mac_addresses,
@@ -89,8 +90,9 @@ async def export_project(
             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
+                if not os.path.islink(path):
                     try:
+                        # check if we can export the file
                         open(path).close()
                     except OSError as e:
                         msg = f"Could not export file {path}: {e}"
@@ -102,6 +104,11 @@ async def export_project(
                     continue
                 _patch_mtime(path)
                 zstream.write(path, os.path.relpath(path, project._path))
+            # save empty directories
+            for directory in dirs:
+                path = os.path.join(root, directory)
+                if not os.listdir(path):
+                    zstream.write(path, os.path.relpath(path, project._path))
         except FileNotFoundError as e:
             log.warning(f"Cannot export local file: {e}")
             continue
@@ -145,7 +152,10 @@ def _patch_mtime(path):
     :param path: file path
     """
 
-    st = os.stat(path)
+    if sys.platform.startswith("win"):
+        # only UNIX type platforms
+        return
+    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()
@@ -161,10 +171,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
@@ -188,7 +194,7 @@ def _is_exportable(path, include_snapshots=False):
 
 
 async def _patch_project_file(
-    project, path, zstream, include_images, keep_compute_id, allow_all_nodes, temporary_dir, reset_mac_addresses
+    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.
@@ -220,16 +226,19 @@ async def _patch_project_file(
                 if not allow_all_nodes and node["node_type"] in ["virtualbox", "vmware"]:
                     raise ControllerError("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
@@ -238,13 +247,13 @@ async def _patch_project_file(
                         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:
                             images.append({"compute_id": compute_id, "image": value, "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

gns3server/controller/import_project.py

@@ -17,6 +17,7 @@
 
 import os
 import sys
+import stat
 import json
 import uuid
 import shutil
@@ -40,7 +41,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
@@ -52,7 +53,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
     """
@@ -95,6 +96,7 @@ async def import_project(controller, project_id, stream, location=None, name=Non
     try:
         with zipfile_zstd.ZipFile(stream) as zip_file:
             await wait_run_in_executor(zip_file.extractall, path)
+            _create_symbolic_links(zip_file, path)
     except zipfile_zstd.BadZipFile:
         raise ControllerError("Cannot extract files from GNS3 project (invalid zip)")
 
@@ -126,7 +128,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"):
@@ -184,6 +186,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 ControllerError(f"Cannot create symbolic link: {e}")
 
 def _move_node_file(path, old_id, new_id):
     """
@@ -269,6 +289,7 @@ async def _import_snapshots(snapshots_path, project_name, project_id):
                 with open(snapshot_path, "rb") as f:
                     with zipfile_zstd.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 ControllerError(f"Cannot open snapshot '{os.path.basename(snapshot)}': {e}")
             except zipfile_zstd.BadZipFile:

gns3server/controller/node.py

@@ -29,8 +29,8 @@ from .controller_error import (
 )
 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
@@ -758,7 +758,13 @@ class Node:
                         break
                 port_name = f"eth{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/notification.py

@@ -15,7 +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 os
+import asyncio
 from contextlib import contextmanager
 
 from gns3server.utils.notification_queue import NotificationQueue
@@ -73,7 +73,7 @@ class Notification:
         """
 
         for controller_listener in self._controller_listeners:
-            controller_listener.put_nowait((action, event, {}))
+            asyncio.get_running_loop().call_soon_threadsafe(controller_listener.put_nowait, (action, event, {}))
 
     def project_has_listeners(self, project_id):
         """
@@ -134,7 +134,7 @@ class Notification:
         except KeyError:
             return
         for listener in project_listeners:
-            listener.put_nowait((action, event, {}))
+            asyncio.get_running_loop().call_soon_threadsafe(listener.put_nowait, (action, event, {}))
 
     def _send_event_to_all_projects(self, action, event):
         """
@@ -146,4 +146,4 @@ class Notification:
         """
         for project_listeners in self._project_listeners.values():
             for listener in project_listeners:
-                listener.put_nowait((action, event, {}))
+                asyncio.get_running_loop().call_soon_threadsafe(listener.put_nowait, (action, event, {}))

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
@@ -26,6 +27,7 @@ import asyncio
 import aiofiles
 import tempfile
 import zipfile
+import pathlib
 
 from uuid import UUID, uuid4
 
@@ -41,8 +43,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
 from .controller_error import ControllerError, ControllerForbiddenError, ControllerNotFoundError
 
 import logging
@@ -152,16 +155,27 @@ class Project:
 
         self._iou_id_lock = asyncio.Lock()
         log.debug(f'Project "{self.name}" [{self._id}] loaded')
+        self.emit_controller_notification("project.created", self.asdict())
 
     def emit_notification(self, action, event):
         """
-        Emit a notification to all clients using this project.
+        Emit a project notification to all clients using this project.
 
         :param action: Action name
         :param event: Event to send
         """
 
-        self.controller.notification.project_emit(action, event, project_id=self.id)
+        self._controller.notification.project_emit(action, event, project_id=self.id)
+
+    def emit_controller_notification(self, action, event):
+        """
+        Emit a controller notification, all clients will see it.
+
+        :param action: Action name
+        :param event: Event to send
+        """
+
+        self._controller.notification.controller_emit(action, event)
 
     async def update(self, **kwargs):
         """
@@ -176,7 +190,7 @@ class Project:
 
         # We send notif only if object has changed
         if old_json != self.asdict():
-            self.emit_notification("project.updated", self.asdict())
+            self.emit_controller_notification("project.updated", self.asdict())
             self.dump()
 
             # update on computes
@@ -199,7 +213,11 @@ class Project:
         if os.path.exists(snapshot_dir):
             for snap in os.listdir(snapshot_dir):
                 if snap.endswith(".gns3project"):
+                    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
@@ -480,7 +498,7 @@ class Project:
 
         if base_name is None:
             return None
-        base_name = re.sub(r"[ ]", "", base_name)
+        base_name = re.sub(r"[ ]", "", base_name)  # remove spaces in node name
         if base_name in self._allocated_node_names:
             base_name = re.sub(r"[0-9]+$", "{0}", base_name)
 
@@ -812,7 +830,8 @@ class Project:
         self._clean_pictures()
         self._status = "closed"
         if not ignore_notification:
-            self.emit_notification("project.closed", self.asdict())
+            self.emit_controller_notification("project.closed", self.asdict())
+
         self.reset()
         self._closing = False
 
@@ -868,6 +887,7 @@ class Project:
             shutil.rmtree(self.path)
         except OSError as e:
             raise ControllerError(f"Cannot delete project directory {self.path}: {str(e)}")
+        self.emit_controller_notification("project.deleted", self.asdict())
 
     async def delete_on_computes(self):
         """
@@ -1026,6 +1046,7 @@ class Project:
             pass
 
         self._loading = False
+        self.emit_controller_notification("project.opened", self.asdict())
         # Should we start the nodes when project is open
         if self._auto_start:
             # Start all in the background without waiting for completion
@@ -1044,13 +1065,15 @@ 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 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":
@@ -1058,6 +1081,18 @@ class Project:
 
         self.dump()
         assert self._status != "closed"
+
+        try:
+            proj = await self._fast_duplication(name, 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 ControllerError(f"Cannot duplicate project: {str(e)}")
+
         try:
             begin = time.time()
 
@@ -1073,7 +1108,7 @@ class Project:
                         zstream,
                         self,
                         tmpdir,
-                        keep_compute_id=True,
+                        keep_compute_ids=True,
                         allow_all_nodes=True,
                         reset_mac_addresses=reset_mac_addresses,
                     )
@@ -1092,7 +1127,7 @@ class Project:
                             str(uuid.uuid4()),
                             f,
                             name=name,
-                            keep_compute_id=True
+                            keep_compute_ids=True
                         )
 
             log.info(f"Project '{project.name}' duplicated in {time.time() - begin:.4f} seconds")
@@ -1296,3 +1331,70 @@ class Project:
 
     def __repr__(self):
         return f"<gns3server.controller.Project {self._name} {self._id}>"
+
+    async def _fast_duplication(self, name=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(self.path).parent.absolute()
+        t0 = time.time()
+        new_project_id = str(uuid.uuid4())
+        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

@@ -51,22 +51,17 @@ class Snapshot:
         self._project = project
         if name:
             self._name = name
-            self._created_at = datetime.now().timestamp()
+            self._created_at = datetime.now(timezone.utc).timestamp()
             filename = (
                 self._name
                 + "_"
-                + datetime.utcfromtimestamp(self._created_at).replace(tzinfo=None).strftime("%d%m%y_%H%M%S")
+                + datetime.fromtimestamp(self._created_at, tz=timezone.utc).replace(tzinfo=None).strftime("%d%m%y_%H%M%S")
                 + ".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, "%d%m%y_%H%M%S").replace(tzinfo=timezone.utc).timestamp()
-                )
-            except ValueError:
-                self._created_at = datetime.utcnow().timestamp()
+            self._created_at = (datetime.strptime(datestring, "%d%m%y_%H%M%S").replace(tzinfo=timezone.utc).timestamp())
         self._path = os.path.join(project.path, "snapshots", filename)
 
     @property
@@ -104,7 +99,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)