Pydantic v2 migration

gns3server/schemas/controller/templates/__init__.py

@@ -14,7 +14,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/>.
 
-from pydantic import BaseModel, Field
+from pydantic import ConfigDict, BaseModel, Field
 from typing import Optional, Union
 from enum import Enum
 from uuid import UUID
@@ -58,15 +58,11 @@ class TemplateCreate(TemplateBase):
 
     name: str
     template_type: NodeType
-
-    class Config:
-        extra = "allow"
+    model_config = ConfigDict(extra="allow")
 
 
 class TemplateUpdate(TemplateBase):
-
-    class Config:
-        extra = "allow"
+    model_config = ConfigDict(extra="allow")
 
 
 class Template(DateTimeModelMixin, TemplateBase):
@@ -77,10 +73,7 @@ class Template(DateTimeModelMixin, TemplateBase):
     symbol: str
     builtin: bool
     template_type: NodeType
-
-    class Config:
-        extra = "allow"
-        orm_mode = True
+    model_config = ConfigDict(extra="allow", from_attributes=True)
 
 
 class TemplateUsage(BaseModel):

gns3server/schemas/controller/templates/docker_templates.py

@@ -44,7 +44,7 @@ class DockerTemplate(TemplateBase):
         description="Path of the web interface",
     )
     console_resolution: Optional[str] = Field(
-        "1024x768", regex="^[0-9]+x[0-9]+$", description="Console resolution for VNC"
+        "1024x768", pattern="^[0-9]+x[0-9]+$", description="Console resolution for VNC"
     )
     extra_hosts: Optional[str] = Field("", description="Docker extra hosts (added to /etc/hosts)")
     extra_volumes: Optional[List] = Field([], description="Additional directories to make persistent")

gns3server/schemas/controller/templates/dynamips_templates.py

@@ -40,12 +40,12 @@ class DynamipsTemplate(TemplateBase):
     exec_area: Optional[int] = Field(64, description="Exec area value")
     mmap: Optional[bool] = Field(True, description="MMAP feature")
     mac_addr: Optional[str] = Field(
-        "", description="Base MAC address", regex="^([0-9a-fA-F]{4}\\.){2}[0-9a-fA-F]{4}$|^$"
+        "", description="Base MAC address", pattern="^([0-9a-fA-F]{4}\\.){2}[0-9a-fA-F]{4}$|^$"
     )
     system_id: Optional[str] = Field("FTX0945W0MY", description="System ID")
     startup_config: Optional[str] = Field("ios_base_startup-config.txt", description="IOS startup configuration file")
     private_config: Optional[str] = Field("", description="IOS private configuration file")
-    idlepc: Optional[str] = Field("", description="Idle-PC value", regex="^(0x[0-9a-fA-F]+)?$|^$")
+    idlepc: Optional[str] = Field("", description="Idle-PC value", pattern="^(0x[0-9a-fA-F]+)?$|^$")
     idlemax: Optional[int] = Field(500, description="Idlemax value")
     idlesleep: Optional[int] = Field(30, description="Idlesleep value")
     disk0: Optional[int] = Field(0, description="Disk0 size in MB")

gns3server/schemas/controller/templates/ethernet_hub_templates.py

@@ -22,14 +22,14 @@ from typing import Optional, List
 
 
 DEFAULT_PORTS = [
-    dict(port_number=0, name="Ethernet0"),
-    dict(port_number=1, name="Ethernet1"),
-    dict(port_number=2, name="Ethernet2"),
-    dict(port_number=3, name="Ethernet3"),
-    dict(port_number=4, name="Ethernet4"),
-    dict(port_number=5, name="Ethernet5"),
-    dict(port_number=6, name="Ethernet6"),
-    dict(port_number=7, name="Ethernet7"),
+    EthernetHubPort(port_number=0, name="Ethernet0"),
+    EthernetHubPort(port_number=1, name="Ethernet1"),
+    EthernetHubPort(port_number=2, name="Ethernet2"),
+    EthernetHubPort(port_number=3, name="Ethernet3"),
+    EthernetHubPort(port_number=4, name="Ethernet4"),
+    EthernetHubPort(port_number=5, name="Ethernet5"),
+    EthernetHubPort(port_number=6, name="Ethernet6"),
+    EthernetHubPort(port_number=7, name="Ethernet7"),
 ]
 
 

gns3server/schemas/controller/templates/ethernet_switch_templates.py

@@ -23,14 +23,14 @@ from typing import Optional, List
 from enum import Enum
 
 DEFAULT_PORTS = [
-    dict(port_number=0, name="Ethernet0", vlan=1, type="access", ethertype="0x8100"),
-    dict(port_number=1, name="Ethernet1", vlan=1, type="access", ethertype="0x8100"),
-    dict(port_number=2, name="Ethernet2", vlan=1, type="access", ethertype="0x8100"),
-    dict(port_number=3, name="Ethernet3", vlan=1, type="access", ethertype="0x8100"),
-    dict(port_number=4, name="Ethernet4", vlan=1, type="access", ethertype="0x8100"),
-    dict(port_number=5, name="Ethernet5", vlan=1, type="access", ethertype="0x8100"),
-    dict(port_number=6, name="Ethernet6", vlan=1, type="access", ethertype="0x8100"),
-    dict(port_number=7, name="Ethernet7", vlan=1, type="access", ethertype="0x8100"),
+    EthernetSwitchPort(port_number=0, name="Ethernet0", vlan=1, type="access", ethertype="0x8100"),
+    EthernetSwitchPort(port_number=1, name="Ethernet1", vlan=1, type="access", ethertype="0x8100"),
+    EthernetSwitchPort(port_number=2, name="Ethernet2", vlan=1, type="access", ethertype="0x8100"),
+    EthernetSwitchPort(port_number=3, name="Ethernet3", vlan=1, type="access", ethertype="0x8100"),
+    EthernetSwitchPort(port_number=4, name="Ethernet4", vlan=1, type="access", ethertype="0x8100"),
+    EthernetSwitchPort(port_number=5, name="Ethernet5", vlan=1, type="access", ethertype="0x8100"),
+    EthernetSwitchPort(port_number=6, name="Ethernet6", vlan=1, type="access", ethertype="0x8100"),
+    EthernetSwitchPort(port_number=7, name="Ethernet7", vlan=1, type="access", ethertype="0x8100"),
 ]
 
 

gns3server/schemas/controller/templates/qemu_templates.py

@@ -45,7 +45,7 @@ class QemuTemplate(TemplateBase):
     adapters: Optional[int] = Field(1, ge=0, le=275, description="Number of adapters")
     adapter_type: Optional[QemuAdapterType] = Field("e1000", description="QEMU adapter type")
     mac_address: Optional[str] = Field(
-        "", description="QEMU MAC address", regex="^([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})$|^$"
+        "", description="QEMU MAC address", pattern="^([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})$|^$"
     )
     first_port_name: Optional[str] = Field("", description="Optional name of the first networking port example: eth0")
     port_name_format: Optional[str] = Field(