gns3-server 3.0.0b2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

gns3server/appliances/fortigate.gns3a

@@ -28,6 +28,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FGT_VM64_KVM-v7.4.4.F-build2573-FORTINET.out.kvm.qcow2",
+            "version": "7.4.4",
+            "md5sum": "dfe0e78827ec728631539669001bb23f",
+            "filesize": 100728832,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.4.3.F-build2573-FORTINET.out.kvm.qcow2",
             "version": "7.4.3",
@@ -42,6 +49,13 @@
             "filesize": 116064256,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FGT_VM64_KVM-v7.2.8.M-build1639-FORTINET.out.kvm_fortios.qcow2",
+            "version": "7.2.8",
+            "md5sum": "5c8fd4baf80aeb2999d4be5a9c49eb3d",
+            "filesize": 89980928,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.2.7.M-build1577-FORTINET.out.kvm.qcow2",
             "version": "7.2.7",
@@ -77,6 +91,13 @@
             "filesize": 86704128,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FGT_VM64_KVM-v7.0.15.M-build0601-FORTINET.out.kvm.qcow2",
+            "version": "7.0.15",
+            "md5sum": "423f50378b7e93098ab765c3dd3a788f",
+            "filesize": 77398016,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.0.14.M-build0601-FORTINET.out.kvm.qcow2",
             "version": "7.0.14",
@@ -367,6 +388,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.4.4",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.4.4.F-build2573-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.4.3",
             "images": {
@@ -381,6 +409,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.2.8",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.2.8.M-build1639-FORTINET.out.kvm_fortios.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.7",
             "images": {
@@ -416,6 +451,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.15",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.0.15.M-build0601-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.14",
             "images": {

gns3server/appliances/fortimanager.gns3a

@@ -29,6 +29,13 @@
         "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",
@@ -43,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",
@@ -64,6 +78,13 @@
             "filesize": 242814976,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FMG_VM64_KVM-v7.0.12-build0623-FORTINET.out.kvm.qcow2",
+            "version": "7.0.12",
+            "md5sum": "5b6f6a2b8bc00e56337aa7023a9025cf",
+            "filesize": 249520128,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.0.11-build0595-FORTINET.out.kvm.qcow2",
             "version": "7.0.11",
@@ -256,6 +277,13 @@
         }
     ],
     "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": {
@@ -270,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": {
@@ -291,6 +326,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.12",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.0.12-build0623-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.11",
             "images": {

gns3server/appliances/fortiweb.gns3a

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

gns3server/appliances/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/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

@@ -26,7 +26,7 @@
     },
     "images": [
         {
-            "filename": "OPNsense-24.1-OpenSSL-nano-amd64.img",
+            "filename": "OPNsense-24.1-nano-amd64.img",
             "version": "24.1",
             "md5sum": "ea8472df2c272419b7834cddaf68048d",
             "filesize": 3221225472,
@@ -72,7 +72,7 @@
         {
             "name": "24.1",
             "images": {
-                "hda_disk_image": "OPNsense-24.1-OpenSSL-nano-amd64.img"
+                "hda_disk_image": "OPNsense-24.1-nano-amd64.img"
             }
         },
         {

gns3server/appliances/pan-vm-fw.gns3a

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

gns3server/appliances/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/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/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
         """
 
-        appname = vendor = "GNS3"
-        docker_resources_dir = os.path.join(platformdirs.user_data_dir(appname, vendor, roaming=True), "docker", "resources")
+        resources_path = Config.instance().settings.Server.resources_path
+        if not resources_path:
+            appname = vendor = "GNS3"
+            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
 

gns3server/compute/dynamips/__init__.py

@@ -521,6 +521,10 @@ class Dynamips(BaseManager):
         if usage is not None and usage != vm.usage:
             vm.usage = usage
 
+        aux_type = settings.get("aux_type")
+        if aux_type is not None and aux_type != vm.aux_type:
+            vm.aux_type = aux_type
+
         # update the configs if needed
         await self.set_vm_configs(vm, settings)
 

gns3server/compute/iou/iou_vm.py

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

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"
@@ -1855,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:
-                    # 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"]
+                try:
+                    if is_ipv6_enabled():
+                        # to fix an issue with Qemu when IPv4 is not enabled
+                        # see https://github.com/GNS3/gns3-gui/issues/2352
+                        # FIXME: consider making this more global (not just for Qemu + SPICE)
+                        console_host = "::"
+                except OSError as e:
+                    raise QemuError("Could not check if IPv6 is enabled: {}".format(e))
+            return ["-spice",
+                    f"addr={console_host},port={port},disable-ticketing",
+                    "-vga", "qxl"]
         else:
             return []
 
@@ -2640,9 +2649,16 @@ 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'])