From 4050bd9e85c431c2b2d2ee09a86b1abab2c07776 Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Wed, 11 Dec 2024 10:12:50 +0000
Subject: [PATCH] #2888: Add identifier keyword to services.

---
 src/primaite/simulator/system/applications/web_browser.py       | 2 +-
 src/primaite/simulator/system/services/arp/arp.py               | 2 +-
 .../simulator/system/services/database/database_service.py      | 2 +-
 src/primaite/simulator/system/services/dns/dns_server.py        | 2 +-
 src/primaite/simulator/system/services/ftp/ftp_client.py        | 2 +-
 src/primaite/simulator/system/services/ftp/ftp_server.py        | 2 +-
 src/primaite/simulator/system/services/icmp/icmp.py             | 2 +-
 src/primaite/simulator/system/services/ntp/ntp_client.py        | 2 +-
 src/primaite/simulator/system/services/ntp/ntp_server.py        | 2 +-
 src/primaite/simulator/system/services/terminal/terminal.py     | 2 +-
 src/primaite/simulator/system/services/web_server/web_server.py | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/primaite/simulator/system/applications/web_browser.py b/src/primaite/simulator/system/applications/web_browser.py
index 35f35fea..271aec71 100644
--- a/src/primaite/simulator/system/applications/web_browser.py
+++ b/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"
diff --git a/src/primaite/simulator/system/services/arp/arp.py b/src/primaite/simulator/system/services/arp/arp.py
index 2e13aa41..91b58bc4 100644
--- a/src/primaite/simulator/system/services/arp/arp.py
+++ b/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.
 
diff --git a/src/primaite/simulator/system/services/database/database_service.py b/src/primaite/simulator/system/services/database/database_service.py
index a5aa4c44..ccf566bf 100644
--- a/src/primaite/simulator/system/services/database/database_service.py
+++ b/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.
 
diff --git a/src/primaite/simulator/system/services/dns/dns_server.py b/src/primaite/simulator/system/services/dns/dns_server.py
index 8a202aea..05a6b373 100644
--- a/src/primaite/simulator/system/services/dns/dns_server.py
+++ b/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"
diff --git a/src/primaite/simulator/system/services/ftp/ftp_client.py b/src/primaite/simulator/system/services/ftp/ftp_client.py
index 604c7f30..e8e79d85 100644
--- a/src/primaite/simulator/system/services/ftp/ftp_client.py
+++ b/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.
 
diff --git a/src/primaite/simulator/system/services/ftp/ftp_server.py b/src/primaite/simulator/system/services/ftp/ftp_server.py
index 596f9e77..cbac2030 100644
--- a/src/primaite/simulator/system/services/ftp/ftp_server.py
+++ b/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.
 
diff --git a/src/primaite/simulator/system/services/icmp/icmp.py b/src/primaite/simulator/system/services/icmp/icmp.py
index 8349fff4..f5225f71 100644
--- a/src/primaite/simulator/system/services/icmp/icmp.py
+++ b/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.
 
diff --git a/src/primaite/simulator/system/services/ntp/ntp_client.py b/src/primaite/simulator/system/services/ntp/ntp_client.py
index a08ae795..8c36b55f 100644
--- a/src/primaite/simulator/system/services/ntp/ntp_client.py
+++ b/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"
diff --git a/src/primaite/simulator/system/services/ntp/ntp_server.py b/src/primaite/simulator/system/services/ntp/ntp_server.py
index c253e322..538a1ec3 100644
--- a/src/primaite/simulator/system/services/ntp/ntp_server.py
+++ b/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"
diff --git a/src/primaite/simulator/system/services/terminal/terminal.py b/src/primaite/simulator/system/services/terminal/terminal.py
index 1e820689..7ecd425d 100644
--- a/src/primaite/simulator/system/services/terminal/terminal.py
+++ b/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"
diff --git a/src/primaite/simulator/system/services/web_server/web_server.py b/src/primaite/simulator/system/services/web_server/web_server.py
index f8ca1a69..0c47961d 100644
--- a/src/primaite/simulator/system/services/web_server/web_server.py
+++ b/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"