gns3-server 3.0.1__tar.gz → 3.0.3__tar.gz

{gns3_server-3.0.1 → gns3_server-3.0.3}/CHANGELOG

@@ -1,5 +1,34 @@
 # Change Log
 
+## 3.0.3 22/01/2025
+
+* Bundle web-ui v3.0.3
+* Refactor command line arguments parsing
+* Fix capture on IOU/IOL links. Fixes #2477
+* Use Python 3.9 to publish API documentation
+* Upgrade dependencies
+
+## 2.2.53 21/01/2025
+
+* Bundle web-ui v2.2.53
+* Add more information when patching .vbox file. Ref https://github.com/GNS3/gns3-gui/issues/3542
+* Increase timeout to run compute HTTP queries. Fixes #2461
+* Use 'allow_methods="*"' in aiohttp_cors.ResourceOptions(). Fixes #2459
+* Upgrade dependencies
+* Update remote-install.sh to support a custom repository and the deb822 source format
+* Fix: do not use the iourc file if IOU licence check is not enabled
+
+## 3.0.2 03/01/2025
+
+* Bundle web-ui v3.0.2
+* Support to create templates based on image checksums.
+* Improvements for installing built-in disks.
+* Use watchdog instead of watchfiles to monitor for new images on the file system
+* Drop Python 3.8
+* Replace python-jose library by joserfc
+* Upgrade dependencies
+* Remove blocking IOU phone home call.
+
 ## 3.0.1 27/12/2024
 
 * Bundle web-ui v3.0.1
@@ -20,7 +49,6 @@
 ## 2.2.52 02/12/2024
 
 * Bundle web-ui v2.2.52
-* Sync appliances
 * Remove restrictions based on file extension when listing images and fix ELF header checks
 * Fix use project name instead of ID for fast duplication when running local server. Fixes #2446
 * Overwrite user resources when the originals have changed.

{gns3_server-3.0.1/gns3_server.egg-info → gns3_server-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gns3-server
-Version: 3.0.1
+Version: 3.0.3
 Summary: GNS3 graphical interface for the GNS3 server.
 Author-email: Jeremy Grossmann <developers@gns3.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -690,47 +690,48 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: uvicorn==0.32.0
-Requires-Dist: pydantic==2.9.2
-Requires-Dist: fastapi==0.115.5
-Requires-Dist: python-multipart==0.0.16
-Requires-Dist: websockets==13.1
+Requires-Dist: uvicorn==0.33.0
+Requires-Dist: pydantic==2.10.4
+Requires-Dist: fastapi==0.115.6
+Requires-Dist: python-multipart==0.0.20
+Requires-Dist: websockets==14.1
 Requires-Dist: aiohttp<3.11,>=3.10.10
-Requires-Dist: async-timeout==4.0.3
+Requires-Dist: async-timeout==5.0.1; python_version < "3.11"
 Requires-Dist: aiofiles<25.0,>=24.1.0
-Requires-Dist: Jinja2<3.2,>=3.1.4
-Requires-Dist: sentry-sdk<2.18,>=2.17
-Requires-Dist: psutil>=6.1.0
+Requires-Dist: Jinja2<3.2,>=3.1.5
+Requires-Dist: sentry-sdk<2.20,>=2.19.2
+Requires-Dist: psutil>=6.1.1
 Requires-Dist: distro>=1.9.0
 Requires-Dist: py-cpuinfo<10.0,>=9.0.0
+Requires-Dist: greenlet==3.1.1
 Requires-Dist: sqlalchemy==2.0.36
 Requires-Dist: aiosqlite==0.20.0
-Requires-Dist: alembic==1.13.3
-Requires-Dist: bcrypt==4.2.0
-Requires-Dist: python-jose[cryptography]==3.3.0
+Requires-Dist: alembic==1.14.0
+Requires-Dist: bcrypt==4.2.1
+Requires-Dist: joserfc==1.0.1
 Requires-Dist: email-validator==2.2.0
-Requires-Dist: watchfiles==0.24.0
+Requires-Dist: watchdog==6.0.0
 Requires-Dist: zstandard==0.23.0
 Requires-Dist: platformdirs<3,>=2.4.0
 Requires-Dist: importlib-resources>=1.3; python_version <= "3.9"
 Requires-Dist: truststore>=0.10.0; python_version >= "3.10"
 Provides-Extra: dev
-Requires-Dist: pytest==8.3.3; extra == "dev"
+Requires-Dist: pytest==8.3.4; extra == "dev"
 Requires-Dist: flake8==7.1.1; extra == "dev"
 Requires-Dist: pytest-timeout==2.3.1; extra == "dev"
-Requires-Dist: pytest-asyncio==0.21.2; extra == "dev"
+Requires-Dist: pytest-asyncio==0.25.2; extra == "dev"
 Requires-Dist: requests==2.32.3; extra == "dev"
-Requires-Dist: httpx==0.27.2; extra == "dev"
-Requires-Dist: httpx_ws==0.6.2; extra == "dev"
+Requires-Dist: httpx==0.28.1; extra == "dev"
+Requires-Dist: httpx_ws==0.7.1; extra == "dev"
 
 # GNS3 server repository
 

gns3_server-3.0.3/dev-requirements.txt

@@ -0,0 +1,7 @@
+pytest==8.3.4
+flake8==7.1.1
+pytest-timeout==2.3.1
+pytest-asyncio==0.25.2
+requests==2.32.3
+httpx==0.28.1
+httpx_ws==0.7.1

{gns3_server-3.0.1 → gns3_server-3.0.3/gns3_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gns3-server
-Version: 3.0.1
+Version: 3.0.3
 Summary: GNS3 graphical interface for the GNS3 server.
 Author-email: Jeremy Grossmann <developers@gns3.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -690,47 +690,48 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: uvicorn==0.32.0
-Requires-Dist: pydantic==2.9.2
-Requires-Dist: fastapi==0.115.5
-Requires-Dist: python-multipart==0.0.16
-Requires-Dist: websockets==13.1
+Requires-Dist: uvicorn==0.33.0
+Requires-Dist: pydantic==2.10.4
+Requires-Dist: fastapi==0.115.6
+Requires-Dist: python-multipart==0.0.20
+Requires-Dist: websockets==14.1
 Requires-Dist: aiohttp<3.11,>=3.10.10
-Requires-Dist: async-timeout==4.0.3
+Requires-Dist: async-timeout==5.0.1; python_version < "3.11"
 Requires-Dist: aiofiles<25.0,>=24.1.0
-Requires-Dist: Jinja2<3.2,>=3.1.4
-Requires-Dist: sentry-sdk<2.18,>=2.17
-Requires-Dist: psutil>=6.1.0
+Requires-Dist: Jinja2<3.2,>=3.1.5
+Requires-Dist: sentry-sdk<2.20,>=2.19.2
+Requires-Dist: psutil>=6.1.1
 Requires-Dist: distro>=1.9.0
 Requires-Dist: py-cpuinfo<10.0,>=9.0.0
+Requires-Dist: greenlet==3.1.1
 Requires-Dist: sqlalchemy==2.0.36
 Requires-Dist: aiosqlite==0.20.0
-Requires-Dist: alembic==1.13.3
-Requires-Dist: bcrypt==4.2.0
-Requires-Dist: python-jose[cryptography]==3.3.0
+Requires-Dist: alembic==1.14.0
+Requires-Dist: bcrypt==4.2.1
+Requires-Dist: joserfc==1.0.1
 Requires-Dist: email-validator==2.2.0
-Requires-Dist: watchfiles==0.24.0
+Requires-Dist: watchdog==6.0.0
 Requires-Dist: zstandard==0.23.0
 Requires-Dist: platformdirs<3,>=2.4.0
 Requires-Dist: importlib-resources>=1.3; python_version <= "3.9"
 Requires-Dist: truststore>=0.10.0; python_version >= "3.10"
 Provides-Extra: dev
-Requires-Dist: pytest==8.3.3; extra == "dev"
+Requires-Dist: pytest==8.3.4; extra == "dev"
 Requires-Dist: flake8==7.1.1; extra == "dev"
 Requires-Dist: pytest-timeout==2.3.1; extra == "dev"
-Requires-Dist: pytest-asyncio==0.21.2; extra == "dev"
+Requires-Dist: pytest-asyncio==0.25.2; extra == "dev"
 Requires-Dist: requests==2.32.3; extra == "dev"
-Requires-Dist: httpx==0.27.2; extra == "dev"
-Requires-Dist: httpx_ws==0.6.2; extra == "dev"
+Requires-Dist: httpx==0.28.1; extra == "dev"
+Requires-Dist: httpx_ws==0.7.1; extra == "dev"
 
 # GNS3 server repository
 

{gns3_server-3.0.1 → gns3_server-3.0.3}/gns3_server.egg-info/SOURCES.txt

@@ -74,6 +74,7 @@ gns3server/appliances/a10-vthunder.gns3a
 gns3server/appliances/aaa.gns3a
 gns3server/appliances/alcatel-7750.gns3a
 gns3server/appliances/almalinux.gns3a
+gns3server/appliances/alpine-cloud.gns3a
 gns3server/appliances/alpine-linux-virt.gns3a
 gns3server/appliances/alpine-linux.gns3a
 gns3server/appliances/arista-ceos.gns3a
@@ -252,6 +253,7 @@ gns3server/appliances/sophos-iview.gns3a
 gns3server/appliances/sophos-utm.gns3a
 gns3server/appliances/sophos-xg.gns3a
 gns3server/appliances/stonework.gns3a
+gns3server/appliances/stormshield-eva.gns3a
 gns3server/appliances/tacacs-gui.gns3a
 gns3server/appliances/tinycore-linux.gns3a
 gns3server/appliances/trendmicro-imsva.gns3a
@@ -574,7 +576,7 @@ gns3server/static/web-ui/NotoSans-Regular.e6139cb1663a1c57.ttf
 gns3server/static/web-ui/ReleaseNotes.txt
 gns3server/static/web-ui/favicon.ico
 gns3server/static/web-ui/index.html
-gns3server/static/web-ui/main.e55eeff5c0ba1cf4.js
+gns3server/static/web-ui/main.2e807eb4bc32f838.js
 gns3server/static/web-ui/polyfills.319c79dd175e50d0.js
 gns3server/static/web-ui/roboto-latin-100.539f0a96b40596f7.woff2
 gns3server/static/web-ui/roboto-latin-100.5ba994dac3e79ea8.woff
@@ -1266,6 +1268,7 @@ tests/utils.py
 tests/.pytest_cache/.gitignore
 tests/.pytest_cache/CACHEDIR.TAG
 tests/.pytest_cache/README.md
+tests/.pytest_cache/v/cache/lastfailed
 tests/.pytest_cache/v/cache/nodeids
 tests/.pytest_cache/v/cache/stepwise
 tests/compute/test_base_node.py

{gns3_server-3.0.1 → gns3_server-3.0.3}/gns3_server.egg-info/requires.txt

@@ -1,26 +1,29 @@
-uvicorn==0.32.0
-pydantic==2.9.2
-fastapi==0.115.5
-python-multipart==0.0.16
-websockets==13.1
+uvicorn==0.33.0
+pydantic==2.10.4
+fastapi==0.115.6
+python-multipart==0.0.20
+websockets==14.1
 aiohttp<3.11,>=3.10.10
-async-timeout==4.0.3
 aiofiles<25.0,>=24.1.0
-Jinja2<3.2,>=3.1.4
-sentry-sdk<2.18,>=2.17
-psutil>=6.1.0
+Jinja2<3.2,>=3.1.5
+sentry-sdk<2.20,>=2.19.2
+psutil>=6.1.1
 distro>=1.9.0
 py-cpuinfo<10.0,>=9.0.0
+greenlet==3.1.1
 sqlalchemy==2.0.36
 aiosqlite==0.20.0
-alembic==1.13.3
-bcrypt==4.2.0
-python-jose[cryptography]==3.3.0
+alembic==1.14.0
+bcrypt==4.2.1
+joserfc==1.0.1
 email-validator==2.2.0
-watchfiles==0.24.0
+watchdog==6.0.0
 zstandard==0.23.0
 platformdirs<3,>=2.4.0
 
+[:python_version < "3.11"]
+async-timeout==5.0.1
+
 [:python_version <= "3.9"]
 importlib-resources>=1.3
 
@@ -28,10 +31,10 @@ importlib-resources>=1.3
 truststore>=0.10.0
 
 [dev]
-pytest==8.3.3
+pytest==8.3.4
 flake8==7.1.1
 pytest-timeout==2.3.1
-pytest-asyncio==0.21.2
+pytest-asyncio==0.25.2
 requests==2.32.3
-httpx==0.27.2
-httpx_ws==0.6.2
+httpx==0.28.1
+httpx_ws==0.7.1

{gns3_server-3.0.1 → gns3_server-3.0.3}/gns3server/api/routes/compute/iou_nodes.py

@@ -284,7 +284,7 @@ async def start_iou_node_capture(
     """
 
     pcap_file_path = os.path.join(node.project.capture_working_directory(), node_capture_data.capture_file_name)
-    await node.start_capture(adapter_number, pcap_file_path)
+    await node.start_capture(adapter_number, port_number, pcap_file_path)
     return {"pcap_file_path": str(pcap_file_path)}
 
 

{gns3_server-3.0.1 → gns3_server-3.0.3}/gns3server/api/routes/controller/images.py

@@ -27,11 +27,11 @@ from fastapi.encoders import jsonable_encoder
 from starlette.requests import ClientDisconnect
 from sqlalchemy.orm.exc import MultipleResultsFound
 from typing import List, Optional
-from gns3server import schemas
 
+from gns3server import schemas
 from gns3server.config import Config
 from gns3server.compute.qemu import Qemu
-from gns3server.utils.images import InvalidImageError, write_image, read_image_info, default_images_directory
+from gns3server.utils.images import InvalidImageError, write_image, read_image_info, default_images_directory, get_builtin_disks
 from gns3server.db.repositories.images import ImagesRepository
 from gns3server.db.repositories.templates import TemplatesRepository
 from gns3server.db.repositories.rbac import RbacRepository
@@ -51,7 +51,6 @@ log = logging.getLogger(__name__)
 
 router = APIRouter()
 
-
 @router.post(
     "/qemu/{image_path:path}",
     response_model=schemas.Image,
@@ -175,6 +174,61 @@ async def upload_image(
     return image
 
 
+@router.delete(
+    "/prune",
+    status_code=status.HTTP_204_NO_CONTENT,
+    dependencies=[Depends(has_privilege("Image.Allocate"))]
+)
+async def prune_images(
+        images_repo: ImagesRepository = Depends(get_repository(ImagesRepository)),
+) -> None:
+    """
+    Prune images not attached to any template.
+
+    Required privilege: Image.Allocate
+    """
+
+    skip_images = get_builtin_disks()
+    await images_repo.prune_images(skip_images)
+
+
+@router.post(
+    "/install",
+    status_code=status.HTTP_204_NO_CONTENT,
+    dependencies=[Depends(has_privilege("Image.Allocate"))]
+)
+async def install_images(
+        images_repo: ImagesRepository = Depends(get_repository(ImagesRepository)),
+        templates_repo: TemplatesRepository = Depends(get_repository(TemplatesRepository))
+) -> None:
+    """
+    Attempt to automatically create templates based on image checksums.
+
+    Required privilege: Image.Allocate
+    """
+
+    skip_images = get_builtin_disks()
+    images = await images_repo.get_images()
+    for image in images:
+        if skip_images and image.filename in skip_images:
+            log.debug(f"Skipping image '{image.path}' for image installation")
+            continue
+        templates = await images_repo.get_image_templates(image.image_id)
+        if templates:
+            # the image is already used by a template
+            log.warning(f"Image '{image.path}' is used by one or more templates")
+            continue
+        await Controller.instance().appliance_manager.install_appliances_from_image(
+            image.path,
+            image.checksum,
+            images_repo,
+            templates_repo,
+            None,
+            None,
+            os.path.dirname(image.path)
+        )
+
+
 @router.get(
     "/{image_path:path}",
     response_model=schemas.Image,
@@ -218,7 +272,7 @@ async def delete_image(
         image = await images_repo.get_image(image_path)
     except MultipleResultsFound:
         raise ControllerBadRequestError(f"Image '{image_path}' matches multiple images. "
-                                        f"Please include the relative path of the image")
+                                        f"Please include the absolute path of the image")
 
     if not image:
         raise ControllerNotFoundError(f"Image '{image_path}' not found")
@@ -236,20 +290,3 @@ async def delete_image(
     success = await images_repo.delete_image(image_path)
     if not success:
         raise ControllerError(f"Image '{image_path}' could not be deleted")
-
-
-@router.post(
-    "/prune",
-    status_code=status.HTTP_204_NO_CONTENT,
-    dependencies=[Depends(has_privilege("Image.Allocate"))]
-)
-async def prune_images(
-        images_repo: ImagesRepository = Depends(get_repository(ImagesRepository)),
-) -> None:
-    """
-    Prune images not attached to any template.
-
-    Required privilege: Image.Allocate
-    """
-
-    await images_repo.prune_images()

{gns3_server-3.0.1 → gns3_server-3.0.3}/gns3server/api/routes/controller/templates.py

@@ -18,6 +18,7 @@
 API routes for templates.
 """
 
+import os
 import hashlib
 import json
 
@@ -34,6 +35,8 @@ from gns3server.db.repositories.templates import TemplatesRepository
 from gns3server.services.templates import TemplatesService
 from gns3server.db.repositories.rbac import RbacRepository
 from gns3server.db.repositories.images import ImagesRepository
+from gns3server.controller.controller_error import ControllerError
+from gns3server.utils.images import get_builtin_disks
 
 from .dependencies.authentication import get_current_active_user
 from .dependencies.rbac import has_privilege
@@ -132,10 +135,28 @@ async def delete_template(
     Required privilege: Template.Allocate
     """
 
+    images = await templates_repo.get_template_images(template_id)
     await TemplatesService(templates_repo).delete_template(template_id)
     await rbac_repo.delete_all_ace_starting_with_path(f"/templates/{template_id}")
-    if prune_images:
-        await images_repo.prune_images()
+    if prune_images and images:
+        skip_images = get_builtin_disks()
+        for image in images:
+            if image.filename in skip_images:
+                continue
+            templates = await images_repo.get_image_templates(image.image_id)
+            if templates:
+                template_names = ", ".join([template.name for template in templates])
+                raise ControllerError(f"Image '{image.path}' is used by one or more templates: {template_names}")
+
+            try:
+                os.remove(image.path)
+            except OSError:
+                log.warning(f"Could not delete image file {image.path}")
+
+            print(f"Deleting image '{image.path}'")
+            success = await images_repo.delete_image(image.path)
+            if not success:
+                raise ControllerError(f"Image '{image.path}' could not removed from the database")
 
 
 @router.get(

gns3_server-3.0.3/gns3server/appliances/alpine-cloud.gns3a

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

gns3_server-3.0.3/gns3server/appliances/stormshield-eva.gns3a

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

{gns3_server-3.0.1 → gns3_server-3.0.3}/gns3server/compute/docker/__init__.py

@@ -115,7 +115,7 @@ class Docker(BaseManager):
             dst_path = self.resources_path()
             log.info(f"Installing Docker resources in '{dst_path}'")
             from gns3server.controller import Controller
-            Controller.instance().install_resource_files(dst_path, "compute/docker/resources")
+            await Controller.instance().install_resource_files(dst_path, "compute/docker/resources")
             await self.install_busybox(dst_path)
         except OSError as e:
             raise DockerError(f"Could not install Docker resources to {dst_path}: {e}")

{gns3_server-3.0.1 → gns3_server-3.0.3}/gns3server/compute/virtualbox/virtualbox_vm.py

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