#2888 - Software: align identifiers, tidy up schemas

tests/integration_tests/extensions/applications/extended_application.py

@@ -4,7 +4,7 @@ from ipaddress import IPv4Address
 from typing import Dict, List, Optional
 from urllib.parse import urlparse
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 
 from primaite import getLogger
 from primaite.interface.request import RequestResponse
@@ -31,7 +31,12 @@ class ExtendedApplication(Application, identifier="ExtendedApplication"):
     The application requests and loads web pages using its domain name and requesting IP addresses using DNS.
     """
 
-    config: "ExtendedApplication.ConfigSchema" = None
+    class ConfigSchema(Application.ConfigSchema):
+        """ConfigSchema for ExtendedApplication."""
+
+        type: str = "ExtendedApplication"
+
+    config: "ExtendedApplication.ConfigSchema" = Field(default_factory=lambda: ExtendedApplication.ConfigSchema())
 
     target_url: Optional[str] = None
 
@@ -44,11 +49,6 @@ class ExtendedApplication(Application, identifier="ExtendedApplication"):
     history: List["BrowserHistoryItem"] = []
     """Keep a log of visited websites and information about the visit, such as response code."""
 
-    class ConfigSchema(Application.ConfigSchema):
-        """ConfigSchema for ExtendedApplication."""
-
-        type: str = "EXTENDED_APPLICATION"
-
     def __init__(self, **kwargs):
         kwargs["name"] = "ExtendedApplication"
         kwargs["protocol"] = PROTOCOL_LOOKUP["TCP"]

tests/integration_tests/extensions/services/extended_service.py

@@ -3,6 +3,8 @@ from ipaddress import IPv4Address
 from typing import Any, Dict, List, Literal, Optional, Union
 from uuid import uuid4
 
+from pydantic import Field
+
 from primaite import getLogger
 from primaite.simulator.file_system.file_system import File
 from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
@@ -24,7 +26,12 @@ class ExtendedService(Service, identifier="ExtendedService"):
     This class inherits from the `Service` class and provides methods to simulate a SQL database.
     """
 
-    config: "ExtendedService.ConfigSchema" = None
+    class ConfigSchema(Service.ConfigSchema):
+        """ConfigSchema for ExtendedService."""
+
+        type: str = "ExtendedService"
+
+    config: "ExtendedService.ConfigSchema" = Field(default_factory=lambda: ExtendedService.ConfigSchema())
 
     password: Optional[str] = None
     """Password that needs to be provided by clients if they want to connect to the DatabaseService."""
@@ -38,11 +45,6 @@ class ExtendedService(Service, identifier="ExtendedService"):
     latest_backup_file_name: str = None
     """File name of latest backup."""
 
-    class ConfigSchema(Service.ConfigSchema):
-        """ConfigSchema for ExtendedService."""
-
-        type: str = "EXTENDED_SERVICE"
-
     def __init__(self, **kwargs):
         kwargs["name"] = "ExtendedService"
         kwargs["port"] = PORT_LOOKUP["POSTGRES_SERVER"]