#2248 - All tests (bar the one config file test) now working. Still need to tidy up docstrings and some docs. Almost there

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

@@ -23,6 +23,7 @@ class DatabaseClient(Application):
 
     server_ip_address: Optional[IPv4Address] = None
     server_password: Optional[str] = None
+    connected: bool = False
     _query_success_tracker: Dict[str, bool] = {}
 
     def __init__(self, **kwargs):
@@ -73,9 +74,10 @@ class DatabaseClient(Application):
         if not connection_id:
             connection_id = str(uuid4())
 
-        return self._connect(
+        self.connected = self._connect(
             server_ip_address=self.server_ip_address, password=self.server_password, connection_id=connection_id
         )
+        return self.connected
 
     def _connect(
         self,
@@ -147,6 +149,7 @@ class DatabaseClient(Application):
         self.sys_log.info(
             f"{self.name}: DatabaseClient disconnected connection {connection_id} from {self.server_ip_address}"
         )
+        self.connected = False
 
     def _query(self, sql: str, query_id: str, connection_id: str, is_reattempt: bool = False) -> bool:
         """

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

@@ -108,13 +108,14 @@ class NTPClient(Service):
 
     def request_time(self) -> None:
         """Send request to ntp_server."""
-        self.software_manager.session_manager.receive_payload_from_software_manager(
-            payload=NTPPacket(),
-            dst_ip_address=self.ntp_server,
-            src_port=self.port,
-            dst_port=self.port,
-            ip_protocol=self.protocol,
-        )
+        if self.ntp_server:
+            self.software_manager.session_manager.receive_payload_from_software_manager(
+                payload=NTPPacket(),
+                dst_ip_address=self.ntp_server,
+                src_port=self.port,
+                dst_port=self.port,
+                ip_protocol=self.protocol,
+            )
 
     def apply_timestep(self, timestep: int) -> None:
         """