#2888: Add identifier keyword to services.

src/primaite/simulator/system/applications/web_browser.py

@@ -46,7 +46,7 @@ class WebBrowser(Application, identifier="WebBrowser"):
     class ConfigSchema(Application.ConfigSchema):
         """ConfigSchema for WebBrowser."""
 
-        type: str = "WEB_BROWSER"
+        type: str = "WEBBROWSER"
 
     def __init__(self, **kwargs):
         kwargs["name"] = "WebBrowser"

src/primaite/simulator/system/services/arp/arp.py

@@ -14,7 +14,7 @@ from primaite.utils.validation.ipv4_address import IPV4Address
 from primaite.utils.validation.port import PORT_LOOKUP
 
 
-class ARP(Service):
+class ARP(Service, identifier="ARP"):
     """
     The ARP (Address Resolution Protocol) Service.
 

src/primaite/simulator/system/services/database/database_service.py

@@ -17,7 +17,7 @@ from primaite.utils.validation.port import PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class DatabaseService(Service):
+class DatabaseService(Service, identifier="DatabaseService"):
     """
     A class for simulating a generic SQL Server service.
 

src/primaite/simulator/system/services/dns/dns_server.py

@@ -13,7 +13,7 @@ from primaite.utils.validation.port import PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class DNSServer(Service):
+class DNSServer(Service, identifier="DNSServer"):
     """Represents a DNS Server as a Service."""
 
     config: "DNSServer.ConfigSchema"

src/primaite/simulator/system/services/ftp/ftp_client.py

@@ -16,7 +16,7 @@ from primaite.utils.validation.port import Port, PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class FTPClient(FTPServiceABC):
+class FTPClient(FTPServiceABC, identifier="FTPClient"):
     """
     A class for simulating an FTP client service.
 

src/primaite/simulator/system/services/ftp/ftp_server.py

@@ -11,7 +11,7 @@ from primaite.utils.validation.port import is_valid_port, PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class FTPServer(FTPServiceABC):
+class FTPServer(FTPServiceABC, identifier="FTPServer"):
     """
     A class for simulating an FTP server service.
 

src/primaite/simulator/system/services/icmp/icmp.py

@@ -14,7 +14,7 @@ from primaite.utils.validation.port import PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class ICMP(Service):
+class ICMP(Service, identifier="ICMP"):
     """
     The Internet Control Message Protocol (ICMP) service.
 

src/primaite/simulator/system/services/ntp/ntp_client.py

@@ -12,7 +12,7 @@ from primaite.utils.validation.port import Port, PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class NTPClient(Service):
+class NTPClient(Service, identifier="NTPClient"):
     """Represents a NTP client as a service."""
 
     config: "NTPClient.ConfigSchema"

src/primaite/simulator/system/services/ntp/ntp_server.py

@@ -11,7 +11,7 @@ from primaite.utils.validation.port import PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class NTPServer(Service):
+class NTPServer(Service, identifier="NTPServer"):
     """Represents a NTP server as a service."""
 
     config: "NTPServer.ConfigSchema"

src/primaite/simulator/system/services/terminal/terminal.py

@@ -129,7 +129,7 @@ class RemoteTerminalConnection(TerminalClientConnection):
         return self.parent_terminal.send(payload=payload, session_id=self.ssh_session_id)
 
 
-class Terminal(Service):
+class Terminal(Service, identifier="Terminal"):
     """Class used to simulate a generic terminal service. Can be interacted with by other terminals via SSH."""
 
     config: "Terminal.ConfigSchema"

src/primaite/simulator/system/services/web_server/web_server.py

@@ -19,7 +19,7 @@ from primaite.utils.validation.port import Port, PORT_LOOKUP
 _LOGGER = getLogger(__name__)
 
 
-class WebServer(Service):
+class WebServer(Service, identifier="WebServer"):
     """Class used to represent a Web Server Service in simulation."""
 
     config: "WebServer.ConfigSchema"