#2888 - Software: align identifiers, tidy up schemas

tests/integration_tests/network/test_broadcast.py

@@ -3,6 +3,7 @@ from ipaddress import IPv4Address, IPv4Network
 from typing import Any, Dict, List, Tuple
 
 import pytest
+from pydantic import Field
 
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
@@ -17,12 +18,12 @@ from primaite.utils.validation.port import PORT_LOOKUP
 class BroadcastTestService(Service, identifier="BroadcastTestService"):
     """A service for sending broadcast and unicast messages over a network."""
 
-    config: "BroadcastTestService.ConfigSchema" = None
-
     class ConfigSchema(Service.ConfigSchema):
         """ConfigSchema for BroadcastTestService."""
 
-        type: str = "BROADCAST_TEST_SERVICE"
+        type: str = "BroadcastTestService"
+
+    config: "BroadcastTestService.ConfigSchema" = Field(default_factory=lambda: BroadcastTestService.ConfigSchema())
 
     def __init__(self, **kwargs):
         # Set default service properties for broadcasting
@@ -53,6 +54,13 @@ class BroadcastTestService(Service, identifier="BroadcastTestService"):
 class BroadcastTestClient(Application, identifier="BroadcastTestClient"):
     """A client application to receive broadcast and unicast messages."""
 
+    class ConfigSchema(Service.ConfigSchema):
+        """ConfigSchema for BroadcastTestClient."""
+
+        type: str = "BroadcastTestClient"
+
+    config: ConfigSchema = Field(default_factory=lambda: BroadcastTestClient.ConfigSchema())
+
     payloads_received: List = []
 
     def __init__(self, **kwargs):