gns3-server 3.0.0b3__py3-none-any.whl → 3.0.0rc2__py3-none-any.whl

gns3server/crash_report.py

@@ -58,7 +58,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://99870c759d1c1d62ceb091d59dbcfa78@o19455.ingest.us.sentry.io/38482"
+    DSN = "https://29d15f2b7fde7fbd860843b7ee24dc7f@o19455.ingest.us.sentry.io/38482"
     _instance = None
 
     def __init__(self):

gns3server/db/models/templates.py

@@ -66,6 +66,7 @@ class DockerTemplate(Template):
     template_id = Column(GUID, ForeignKey("templates.template_id", ondelete="CASCADE"), primary_key=True)
     image = Column(String)
     adapters = Column(Integer)
+    mac_address = Column(String)
     start_command = Column(String)
     environment = Column(String)
     console_type = Column(String)

gns3server/db/tasks.py

@@ -77,7 +77,7 @@ async def connect_to_db(app: FastAPI) -> None:
 
     db_path = os.path.join(Config.instance().config_dir, "gns3_controller.db")
     db_url = os.environ.get("GNS3_DATABASE_URI", f"sqlite+aiosqlite:///{db_path}")
-    engine = create_async_engine(db_url, connect_args={"check_same_thread": False}, future=True)
+    engine = create_async_engine(db_url, connect_args={"check_same_thread": False, "timeout": 20}, future=True)
     alembic_cfg = config.Config()
     alembic_cfg.set_main_option("script_location", "gns3server:db_migrations")
     #alembic_cfg.set_main_option('sqlalchemy.url', db_url)

gns3server/db_migrations/versions/9a5292aa4389_add_mac_address_field_in_docker_.py

@@ -0,0 +1,27 @@
+"""add mac_address field in Docker templates table
+
+Revision ID: 9a5292aa4389
+Revises: 7ceeddd9c9a8
+Create Date: 2024-09-18 17:52:53.429522
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9a5292aa4389'
+down_revision = '7ceeddd9c9a8'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+
+    op.add_column('docker_templates', sa.Column('mac_address', sa.String()))
+
+
+def downgrade() -> None:
+
+    op.drop_column('docker_templates', 'mac_address')
+

gns3server/schemas/compute/docker_nodes.py

@@ -39,6 +39,7 @@ class DockerBase(BaseModel):
     usage: Optional[str] = Field(None, description="How to use the Docker container")
     start_command: Optional[str] = Field(None, description="Docker CMD entry")
     adapters: Optional[int] = Field(None, ge=0, le=99, description="Number of adapters")
+    mac_address: Optional[str] = Field(None, description="Base MAC address", pattern="^([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})$")
     environment: Optional[str] = Field(None, description="Docker environment variables")
     extra_hosts: Optional[str] = Field(None, description="Docker extra hosts (added to /etc/hosts)")
     extra_volumes: Optional[List[str]] = Field(None, description="Additional directories to make persistent")

gns3server/schemas/compute/ethernet_switch_nodes.py

@@ -43,7 +43,7 @@ class EthernetSwitchPort(BaseModel):
     port_number: int
     type: EthernetSwitchPortType = Field(..., description="Port type")
     vlan: int = Field(..., ge=1, le=4094, description="VLAN number")
-    ethertype: Optional[EthernetSwitchEtherType] = Field("0x8100", description="QinQ Ethertype")
+    ethertype: Optional[EthernetSwitchEtherType] = Field(EthernetSwitchEtherType.ethertype_8021q, description="QinQ Ethertype")
 
     @model_validator(mode="after")
     def check_ethertype(self) -> "EthernetSwitchPort":

gns3server/schemas/config.py

@@ -69,6 +69,7 @@ class QemuSettings(BaseModel):
     monitor_host: str = "127.0.0.1"
     enable_hardware_acceleration: bool = True
     require_hardware_acceleration: bool = False
+    allow_unsafe_options: bool = False
     model_config = ConfigDict(validate_assignment=True, str_strip_whitespace=True)
 
 
@@ -126,6 +127,7 @@ class ServerSettings(BaseModel):
     appliances_path: str = "~/GNS3/appliances"
     symbols_path: str = "~/GNS3/symbols"
     configs_path: str = "~/GNS3/configs"
+    resources_path: str = None
     default_symbol_theme: BuiltinSymbolTheme = BuiltinSymbolTheme.affinity_square_blue
     allow_raw_images: bool = True
     auto_discover_images: bool = True
@@ -144,6 +146,7 @@ class ServerSettings(BaseModel):
     default_nat_interface: str = None
     allow_remote_console: bool = False
     enable_builtin_templates: bool = True
+    install_builtin_appliances: bool = True
     model_config = ConfigDict(validate_assignment=True, str_strip_whitespace=True, use_enum_values=True)
 
     @field_validator("additional_images_paths", mode="before")

gns3server/schemas/controller/templates/cloud_templates.py

@@ -29,13 +29,13 @@ from typing import Optional, Union, List
 
 class CloudTemplate(TemplateBase):
 
-    category: Optional[Category] = "guest"
+    category: Optional[Category] = Category.guest
     default_name_format: Optional[str] = "Cloud{0}"
     symbol: Optional[str] = "cloud"
     ports_mapping: List[Union[EthernetPort, TAPPort, UDPPort]] = Field(default_factory=list)
     remote_console_host: Optional[str] = Field("127.0.0.1", description="Remote console host or IP")
     remote_console_port: Optional[int] = Field(23, gt=0, le=65535, description="Remote console TCP port")
-    remote_console_type: Optional[CloudConsoleType] = Field("none", description="Remote console type")
+    remote_console_type: Optional[CloudConsoleType] = Field(CloudConsoleType.none, description="Remote console type")
     remote_console_http_path: Optional[str] = Field("/", description="Path of the remote web interface")
 
 

gns3server/schemas/controller/templates/docker_templates.py

@@ -24,15 +24,16 @@ from typing import Optional, List
 
 class DockerTemplate(TemplateBase):
 
-    category: Optional[Category] = "guest"
+    category: Optional[Category] = Category.guest
     default_name_format: Optional[str] = "{name}-{0}"
     symbol: Optional[str] = "docker_guest"
     image: str = Field(..., description="Docker image name")
     adapters: Optional[int] = Field(1, ge=0, le=100, description="Number of adapters")
+    mac_address: Optional[str] = Field("", description="Base MAC address", pattern="^([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})$|^$")
     start_command: Optional[str] = Field("", description="Docker CMD entry")
     environment: Optional[str] = Field("", description="Docker environment variables")
-    console_type: Optional[ConsoleType] = Field("telnet", description="Console type")
-    aux_type: Optional[AuxType] = Field("none", description="Auxiliary console type")
+    console_type: Optional[ConsoleType] = Field(ConsoleType.telnet, description="Console type")
+    aux_type: Optional[AuxType] = Field(AuxType.none, description="Auxiliary console type")
     console_auto_start: Optional[bool] = Field(
         False, description="Automatically start the console when the node has started"
     )

gns3server/schemas/controller/templates/dynamips_templates.py

@@ -32,7 +32,7 @@ from enum import Enum
 
 class DynamipsTemplate(TemplateBase):
 
-    category: Optional[Category] = "router"
+    category: Optional[Category] = Category.router
     default_name_format: Optional[str] = "R{0}"
     symbol: Optional[str] = "router"
     platform: DynamipsPlatform = Field(..., description="Cisco router platform")
@@ -51,11 +51,11 @@ class DynamipsTemplate(TemplateBase):
     disk0: Optional[int] = Field(0, description="Disk0 size in MB")
     disk1: Optional[int] = Field(0, description="Disk1 size in MB")
     auto_delete_disks: Optional[bool] = Field(False, description="Automatically delete nvram and disk files")
-    console_type: Optional[DynamipsConsoleType] = Field("telnet", description="Console type")
+    console_type: Optional[DynamipsConsoleType] = Field(DynamipsConsoleType.telnet, description="Console type")
     console_auto_start: Optional[bool] = Field(
         False, description="Automatically start the console when the node has started"
     )
-    aux_type: Optional[DynamipsConsoleType] = Field("none", description="Auxiliary console type")
+    aux_type: Optional[DynamipsConsoleType] = Field(DynamipsConsoleType.none, description="Auxiliary console type")
     slot0: Optional[DynamipsAdapters] = Field(None, description="Network module slot 0")
     slot1: Optional[DynamipsAdapters] = Field(None, description="Network module slot 1")
     slot2: Optional[DynamipsAdapters] = Field(None, description="Network module slot 2")
@@ -72,8 +72,8 @@ class C7200DynamipsTemplate(DynamipsTemplate):
 
     ram: Optional[int] = Field(512, description="Amount of RAM in MB")
     nvram: Optional[int] = Field(512, description="Amount of NVRAM in KB")
-    npe: Optional[DynamipsNPE] = Field("npe-400", description="NPE model")
-    midplane: Optional[DynamipsMidplane] = Field("vxr", description="Midplane model")
+    npe: Optional[DynamipsNPE] = Field(DynamipsNPE.npe_400, description="NPE model")
+    midplane: Optional[DynamipsMidplane] = Field(DynamipsMidplane.vxr, description="Midplane model")
     sparsemem: Optional[bool] = Field(True, description="Sparse memory feature")
 
 

gns3server/schemas/controller/templates/ethernet_hub_templates.py

@@ -35,7 +35,7 @@ DEFAULT_PORTS = [
 
 class EthernetHubTemplate(TemplateBase):
 
-    category: Optional[Category] = "switch"
+    category: Optional[Category] = Category.switch
     default_name_format: Optional[str] = "Hub{0}"
     symbol: Optional[str] = "hub"
     ports_mapping: Optional[List[EthernetHubPort]] = Field(DEFAULT_PORTS, description="Ports")

gns3server/schemas/controller/templates/ethernet_switch_templates.py

@@ -45,11 +45,11 @@ class ConsoleType(str, Enum):
 
 class EthernetSwitchTemplate(TemplateBase):
 
-    category: Optional[Category] = "switch"
+    category: Optional[Category] = Category.switch
     default_name_format: Optional[str] = "Switch{0}"
     symbol: Optional[str] = "ethernet_switch"
     ports_mapping: Optional[List[EthernetSwitchPort]] = Field(DEFAULT_PORTS, description="Ports")
-    console_type: Optional[ConsoleType] = Field("none", description="Console type")
+    console_type: Optional[ConsoleType] = Field(ConsoleType.none, description="Console type")
 
 
 class EthernetSwitchTemplateUpdate(EthernetSwitchTemplate):

gns3server/schemas/controller/templates/iou_templates.py

@@ -24,7 +24,7 @@ from typing import Optional
 
 class IOUTemplate(TemplateBase):
 
-    category: Optional[Category] = "router"
+    category: Optional[Category] = Category.router
     default_name_format: Optional[str] = "IOU{0}"
     symbol: Optional[str] = "multilayer_switch"
     path: str = Field(..., description="Path of IOU executable")
@@ -36,7 +36,7 @@ class IOUTemplate(TemplateBase):
     startup_config: Optional[str] = Field("iou_l3_base_startup-config.txt", description="Startup-config of IOU")
     private_config: Optional[str] = Field("", description="Private-config of IOU")
     l1_keepalives: Optional[bool] = Field(False, description="Always keep up Ethernet interface (does not always work)")
-    console_type: Optional[ConsoleType] = Field("telnet", description="Console type")
+    console_type: Optional[ConsoleType] = Field(ConsoleType.telnet, description="Console type")
     console_auto_start: Optional[bool] = Field(
         False, description="Automatically start the console when the node has started"
     )

gns3server/schemas/controller/templates/qemu_templates.py

@@ -33,17 +33,17 @@ from typing import Optional, List
 
 class QemuTemplate(TemplateBase):
 
-    category: Optional[Category] = "guest"
+    category: Optional[Category] = Category.guest
     default_name_format: Optional[str] = "{name}-{0}"
     symbol: Optional[str] = "qemu_guest"
     qemu_path: Optional[str] = Field("", description="Qemu executable path")
-    platform: Optional[QemuPlatform] = Field("x86_64", description="Platform to emulate")
+    platform: Optional[QemuPlatform] = Field(QemuPlatform.x86_64, description="Platform to emulate")
     linked_clone: Optional[bool] = Field(True, description="Whether the VM is a linked clone or not")
     ram: Optional[int] = Field(256, description="Amount of RAM in MB")
     cpus: Optional[int] = Field(1, ge=1, le=255, description="Number of vCPUs")
     maxcpus: Optional[int] = Field(1, ge=1, le=255, description="Maximum number of hotpluggable vCPUs")
     adapters: Optional[int] = Field(1, ge=0, le=275, description="Number of adapters")
-    adapter_type: Optional[QemuAdapterType] = Field("e1000", description="QEMU adapter type")
+    adapter_type: Optional[QemuAdapterType] = Field(QemuAdapterType.e1000, description="QEMU adapter type")
     mac_address: Optional[str] = Field(
         "", description="QEMU MAC address", pattern="^([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})$|^$"
     )
@@ -55,20 +55,20 @@ class QemuTemplate(TemplateBase):
         0,
         description="Optional port segment size. A port segment is a block of port. For example Ethernet0/0 Ethernet0/1 is the module 0 with a port segment size of 2",
     )
-    console_type: Optional[QemuConsoleType] = Field("telnet", description="Console type")
+    console_type: Optional[QemuConsoleType] = Field(QemuConsoleType.telnet, description="Console type")
     console_auto_start: Optional[bool] = Field(
         False, description="Automatically start the console when the node has started"
     )
-    aux_type: Optional[QemuConsoleType] = Field("none", description="Auxiliary console type")
-    boot_priority: Optional[QemuBootPriority] = Field("c", description="QEMU boot priority")
+    aux_type: Optional[QemuConsoleType] = Field(QemuConsoleType.none, description="Auxiliary console type")
+    boot_priority: Optional[QemuBootPriority] = Field(QemuBootPriority.c, description="QEMU boot priority")
     hda_disk_image: Optional[str] = Field("", description="QEMU hda disk image path")
-    hda_disk_interface: Optional[QemuDiskInterfaceType] = Field("none", description="QEMU hda interface")
+    hda_disk_interface: Optional[QemuDiskInterfaceType] = Field(QemuDiskInterfaceType.none, description="QEMU hda interface")
     hdb_disk_image: Optional[str] = Field("", description="QEMU hdb disk image path")
-    hdb_disk_interface: Optional[QemuDiskInterfaceType] = Field("none", description="QEMU hdb interface")
+    hdb_disk_interface: Optional[QemuDiskInterfaceType] = Field(QemuDiskInterfaceType.none, description="QEMU hdb interface")
     hdc_disk_image: Optional[str] = Field("", description="QEMU hdc disk image path")
-    hdc_disk_interface: Optional[QemuDiskInterfaceType] = Field("none", description="QEMU hdc interface")
+    hdc_disk_interface: Optional[QemuDiskInterfaceType] = Field(QemuDiskInterfaceType.none, description="QEMU hdc interface")
     hdd_disk_image: Optional[str] = Field("", description="QEMU hdd disk image path")
-    hdd_disk_interface: Optional[QemuDiskInterfaceType] = Field("none", description="QEMU hdd interface")
+    hdd_disk_interface: Optional[QemuDiskInterfaceType] = Field(QemuDiskInterfaceType.none, description="QEMU hdd interface")
     cdrom_image: Optional[str] = Field("", description="QEMU cdrom image path")
     initrd: Optional[str] = Field("", description="QEMU initrd path")
     kernel_image: Optional[str] = Field("", description="QEMU kernel image path")
@@ -82,9 +82,9 @@ class QemuTemplate(TemplateBase):
     )
     tpm: Optional[bool] = Field(False, description="Enable Trusted Platform Module (TPM)")
     uefi: Optional[bool] = Field(False, description="Enable UEFI boot mode")
-    on_close: Optional[QemuOnCloseAction] = Field("power_off", description="Action to execute on the VM is closed")
+    on_close: Optional[QemuOnCloseAction] = Field(QemuOnCloseAction.power_off, description="Action to execute on the VM is closed")
     cpu_throttling: Optional[int] = Field(0, ge=0, le=800, description="Percentage of CPU allowed for QEMU")
-    process_priority: Optional[QemuProcessPriority] = Field("normal", description="Process priority for QEMU")
+    process_priority: Optional[QemuProcessPriority] = Field(QemuProcessPriority.normal, description="Process priority for QEMU")
     options: Optional[str] = Field("", description="Additional QEMU options")
     custom_adapters: Optional[List[CustomAdapter]] = Field(default_factory=list, description="Custom adapters")
 

gns3server/schemas/controller/templates/virtualbox_templates.py

@@ -28,7 +28,7 @@ from typing import Optional, List
 
 class VirtualBoxTemplate(TemplateBase):
 
-    category: Optional[Category] = "guest"
+    category: Optional[Category] = Category.guest
     default_name_format: Optional[str] = "{name}-{0}"
     symbol: Optional[str] = "vbox_guest"
     vmname: str = Field(..., description="VirtualBox VM name (in VirtualBox itself)")
@@ -38,8 +38,7 @@ class VirtualBoxTemplate(TemplateBase):
         1, ge=0, le=36, description="Number of adapters"
     )  # 36 is the maximum given by the ICH9 chipset in VirtualBox
     use_any_adapter: Optional[bool] = Field(False, description="Allow GNS3 to use any VirtualBox adapter")
-    adapter_type: Optional[VirtualBoxAdapterType] = Field(
-        "Intel PRO/1000 MT Desktop (82540EM)", description="VirtualBox adapter type"
+    adapter_type: Optional[VirtualBoxAdapterType] = Field(VirtualBoxAdapterType.intel_pro_1000_mt_desktop, description="VirtualBox adapter type"
     )
     first_port_name: Optional[str] = Field("", description="Optional name of the first networking port example: eth0")
     port_name_format: Optional[str] = Field(
@@ -51,9 +50,9 @@ class VirtualBoxTemplate(TemplateBase):
     )
     headless: Optional[bool] = Field(False, description="Headless mode")
     on_close: Optional[VirtualBoxOnCloseAction] = Field(
-        "power_off", description="Action to execute on the VM is closed"
+        VirtualBoxOnCloseAction.power_off, description="Action to execute on the VM is closed"
     )
-    console_type: Optional[VirtualBoxConsoleType] = Field("none", description="Console type")
+    console_type: Optional[VirtualBoxConsoleType] = Field(VirtualBoxConsoleType.none, description="Console type")
     console_auto_start: Optional[bool] = Field(
         False, description="Automatically start the console when the node has started"
     )

gns3server/schemas/controller/templates/vmware_templates.py

@@ -29,7 +29,7 @@ from typing import Optional, List
 
 class VMwareTemplate(TemplateBase):
 
-    category: Optional[Category] = "guest"
+    category: Optional[Category] = Category.guest
     default_name_format: Optional[str] = "{name}-{0}"
     symbol: Optional[str] = "vmware_guest"
     vmx_path: str = Field(..., description="Path to the vmx file")
@@ -45,11 +45,11 @@ class VMwareTemplate(TemplateBase):
     adapters: Optional[int] = Field(
         1, ge=0, le=10, description="Number of adapters"
     )  # 10 is the maximum adapters support by VMware VMs
-    adapter_type: Optional[VMwareAdapterType] = Field("e1000", description="VMware adapter type")
+    adapter_type: Optional[VMwareAdapterType] = Field(VMwareAdapterType.e1000, description="VMware adapter type")
     use_any_adapter: Optional[bool] = Field(False, description="Allow GNS3 to use any VMware adapter")
     headless: Optional[bool] = Field(False, description="Headless mode")
-    on_close: Optional[VMwareOnCloseAction] = Field("power_off", description="Action to execute on the VM is closed")
-    console_type: Optional[VMwareConsoleType] = Field("none", description="Console type")
+    on_close: Optional[VMwareOnCloseAction] = Field(VMwareOnCloseAction.power_off, description="Action to execute on the VM is closed")
+    console_type: Optional[VMwareConsoleType] = Field(VMwareConsoleType.none, description="Console type")
     console_auto_start: Optional[bool] = Field(
         False, description="Automatically start the console when the node has started"
     )

gns3server/schemas/controller/templates/vpcs_templates.py

@@ -24,11 +24,11 @@ from typing import Optional
 
 class VPCSTemplate(TemplateBase):
 
-    category: Optional[Category] = "guest"
+    category: Optional[Category] = Category.guest
     default_name_format: Optional[str] = "PC{0}"
     symbol: Optional[str] = "vpcs_guest"
     base_script_file: Optional[str] = Field("vpcs_base_config.txt", description="Script file")
-    console_type: Optional[ConsoleType] = Field("telnet", description="Console type")
+    console_type: Optional[ConsoleType] = Field(ConsoleType.telnet, description="Console type")
     console_auto_start: Optional[bool] = Field(
         False, description="Automatically start the console when the node has started"
     )

gns3server/static/web-ui/index.html

@@ -36,7 +36,7 @@
   <body class="mat-app-background" oncontextmenu="return false;">
     <app-root></app-root>
     <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async="" src="https://www.googletagmanager.com/gtag/js?id=G-5D6FZL9923"></script>
+    <script async="" src="https://www.googletagmanager.com/gtag/js?id=G-0BT7QQV1W1"></script>
     <script>
       window.dataLayer = window.dataLayer || [];
       function gtag() {
@@ -44,8 +44,8 @@
       }
       gtag('js', new Date());
 
-      gtag('config', 'G-5D6FZL9923');
+      gtag('config', 'G-0BT7QQV1W1');
     </script>
-  <script src="runtime.24fa95b7061d7056.js" type="module"></script><script src="polyfills.319c79dd175e50d0.js" type="module"></script><script src="main.f3840f9b1c0240e6.js" type="module"></script>
+  <script src="runtime.24fa95b7061d7056.js" type="module"></script><script src="polyfills.319c79dd175e50d0.js" type="module"></script><script src="main.ed82697b58d803e7.js" type="module"></script>
 
 </body></html>