#3062 - rename identifier to discriminator

tests/conftest.py

@@ -39,7 +39,7 @@ ACTION_SPACE_NODE_ACTION_VALUES = 1
 _LOGGER = getLogger(__name__)
 
 
-class DummyService(Service, identifier="DummyService"):
+class DummyService(Service, discriminator="DummyService"):
     """Test Service class"""
 
     class ConfigSchema(Service.ConfigSchema):
@@ -62,7 +62,7 @@ class DummyService(Service, identifier="DummyService"):
         pass
 
 
-class DummyApplication(Application, identifier="DummyApplication"):
+class DummyApplication(Application, discriminator="DummyApplication"):
     """Test Application class"""
 
     class ConfigSchema(Application.ConfigSchema):
@@ -280,7 +280,7 @@ def example_network() -> Network:
     return network
 
 
-class ControlledAgent(AbstractAgent, identifier="ControlledAgent"):
+class ControlledAgent(AbstractAgent, discriminator="ControlledAgent"):
     """Agent that can be controlled by the tests."""
 
     config: "ControlledAgent.ConfigSchema" = Field(default_factory=lambda: ControlledAgent.ConfigSchema())

tests/integration_tests/extensions/applications/extended_application.py

@@ -24,7 +24,7 @@ from primaite.utils.validation.port import PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class ExtendedApplication(Application, identifier="ExtendedApplication"):
+class ExtendedApplication(Application, discriminator="ExtendedApplication"):
     """
     Clone of web browser that uses the extension framework instead of being part of PrimAITE directly.
 

tests/integration_tests/extensions/nodes/giga_switch.py

@@ -11,7 +11,7 @@ from primaite.simulator.network.hardware.nodes.network.switch import SwitchPort
 from primaite.simulator.network.transmission.data_link_layer import Frame
 
 
-class GigaSwitch(NetworkNode, identifier="gigaswitch"):
+class GigaSwitch(NetworkNode, discriminator="gigaswitch"):
     """
     A class representing a Layer 2 network switch.
 

tests/integration_tests/extensions/nodes/super_computer.py

@@ -6,7 +6,7 @@ from primaite.simulator.system.services.ftp.ftp_client import FTPClient
 from primaite.utils.validation.ipv4_address import IPV4Address
 
 
-class SuperComputer(HostNode, identifier="supercomputer"):
+class SuperComputer(HostNode, discriminator="supercomputer"):
     """
     A basic Computer class.
 

tests/integration_tests/extensions/services/extended_service.py

@@ -19,7 +19,7 @@ from primaite.utils.validation.port import PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class ExtendedService(Service, identifier="ExtendedService"):
+class ExtendedService(Service, discriminator="ExtendedService"):
     """
     A copy of DatabaseService that uses the extension framework instead of being part of PrimAITE.
 

tests/integration_tests/network/test_broadcast.py

@@ -15,7 +15,7 @@ from primaite.utils.validation.ip_protocol import PROTOCOL_LOOKUP
 from primaite.utils.validation.port import PORT_LOOKUP
 
 
-class BroadcastTestService(Service, identifier="BroadcastTestService"):
+class BroadcastTestService(Service, discriminator="BroadcastTestService"):
     """A service for sending broadcast and unicast messages over a network."""
 
     class ConfigSchema(Service.ConfigSchema):
@@ -51,7 +51,7 @@ class BroadcastTestService(Service, identifier="BroadcastTestService"):
         )
 
 
-class BroadcastTestClient(Application, identifier="BroadcastTestClient"):
+class BroadcastTestClient(Application, discriminator="BroadcastTestClient"):
     """A client application to receive broadcast and unicast messages."""
 
     class ConfigSchema(Service.ConfigSchema):

tests/integration_tests/system/test_service_listening_on_ports.py

@@ -14,7 +14,7 @@ from primaite.utils.validation.port import PORT_LOOKUP
 from tests import TEST_ASSETS_ROOT
 
 
-class _DatabaseListener(Service, identifier="_DatabaseListener"):
+class _DatabaseListener(Service, discriminator="_DatabaseListener"):
     class ConfigSchema(Service.ConfigSchema):
         """ConfigSchema for _DatabaseListener."""
 

tests/unit_tests/_primaite/_simulator/_system/_applications/test_application_registry.py

@@ -5,14 +5,14 @@ from primaite.simulator.system.applications.application import Application
 
 
 def test_adding_to_app_registry():
-    class temp_application(Application, identifier="temp_app"):
+    class temp_application(Application, discriminator="temp_app"):
         pass
 
     assert Application._registry["temp_app"] is temp_application
 
     with pytest.raises(ValueError):
 
-        class another_application(Application, identifier="temp_app"):
+        class another_application(Application, discriminator="temp_app"):
             pass
 
     # This is kinda evil...

tests/unit_tests/_primaite/_simulator/_system/test_software.py

@@ -11,7 +11,7 @@ from primaite.utils.validation.ip_protocol import PROTOCOL_LOOKUP
 from primaite.utils.validation.port import PORT_LOOKUP
 
 
-class TestSoftware(Service, identifier="TestSoftware"):
+class TestSoftware(Service, discriminator="TestSoftware"):
     class ConfigSchema(Service.ConfigSchema):
         """ConfigSChema for TestSoftware."""