Merge origin/dev into feature/1859

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

@@ -2,8 +2,11 @@ from abc import abstractmethod
 from enum import Enum
 from typing import Any, Dict, Set
 
+from primaite import getLogger
 from primaite.simulator.system.software import IOSoftware, SoftwareHealthState
 
+_LOGGER = getLogger(__name__)
+
 
 class ApplicationOperatingState(Enum):
     """Enumeration of Application Operating States."""
@@ -57,7 +60,7 @@ class Application(IOSoftware):
         state = super().describe_state()
         state.update(
             {
-                "opearting_state": self.operating_state.value,
+                "operating_state": self.operating_state.value,
                 "execution_control_status": self.execution_control_status,
                 "num_executions": self.num_executions,
                 "groups": list(self.groups),
@@ -65,8 +68,30 @@ class Application(IOSoftware):
         )
         return state
 
+    def _can_perform_action(self) -> bool:
+        """
+        Checks if the application can perform actions.
+
+        This is done by checking if the application is operating properly or the node it is installed
+        in is operational.
+
+        Returns true if the software can perform actions.
+        """
+        if not super()._can_perform_action():
+            return False
+
+        if self.operating_state is not self.operating_state.RUNNING:
+            # service is not running
+            _LOGGER.error(f"Cannot perform action: {self.name} is {self.operating_state.name}")
+            return False
+
+        return True
+
     def run(self) -> None:
         """Open the Application."""
+        if not super()._can_perform_action():
+            return
+
         if self.operating_state == ApplicationOperatingState.CLOSED:
             self.sys_log.info(f"Running Application {self.name}")
             self.operating_state = ApplicationOperatingState.RUNNING
@@ -83,6 +108,9 @@ class Application(IOSoftware):
 
     def install(self) -> None:
         """Install Application."""
+        if self._can_perform_action():
+            return
+
         super().install()
         if self.operating_state == ApplicationOperatingState.CLOSED:
             self.sys_log.info(f"Installing Application {self.name}")
@@ -98,4 +126,4 @@ class Application(IOSoftware):
         :param payload: The payload to receive.
         :return: True if successful, False otherwise.
         """
-        pass
+        return super().receive(payload=payload, session_id=session_id, **kwargs)

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

@@ -61,7 +61,10 @@ class DatabaseClient(Application):
 
     def connect(self) -> bool:
         """Connect to a Database Service."""
-        if not self.connected and self.operating_state == ApplicationOperatingState.RUNNING:
+        if not self._can_perform_action():
+            return False
+
+        if not self.connected:
             return self._connect(self.server_ip_address, self.server_password)
         return False
 
@@ -142,20 +145,31 @@ class DatabaseClient(Application):
         if self.operating_state == ApplicationOperatingState.RUNNING:
             self.connect()
 
-    def query(self, sql: str) -> bool:
+    def query(self, sql: str, is_reattempt: bool = False) -> bool:
         """
         Send a query to the Database Service.
 
-        :param sql: The SQL query.
+        :param: sql: The SQL query.
+        :param: is_reattempt: If true, the action has been reattempted.
         :return: True if the query was successful, otherwise False.
         """
-        if self.connected and self.operating_state == ApplicationOperatingState.RUNNING:
+        if not self._can_perform_action():
+            return False
+
+        if self.connected:
             query_id = str(uuid4())
 
             # Initialise the tracker of this ID to False
             self._query_success_tracker[query_id] = False
             return self._query(sql=sql, query_id=query_id)
-        return False
+        else:
+            if is_reattempt:
+                return False
+
+            if not self.connect():
+                return False
+
+            self.query(sql=sql, is_reattempt=True)
 
     def receive(self, payload: Any, session_id: str, **kwargs) -> bool:
         """

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

@@ -3,7 +3,12 @@ from typing import Dict, Optional
 from urllib.parse import urlparse
 
 from primaite.simulator.core import RequestManager, RequestType
-from primaite.simulator.network.protocols.http import HttpRequestMethod, HttpRequestPacket, HttpResponsePacket
+from primaite.simulator.network.protocols.http import (
+    HttpRequestMethod,
+    HttpRequestPacket,
+    HttpResponsePacket,
+    HttpStatusCode,
+)
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.applications.application import Application
@@ -72,8 +77,11 @@ class WebBrowser(Application):
         :type: url: str
         """
         url = self.target_url
+        if not self._can_perform_action():
+            return False
+
         # reset latest response
-        self.latest_response = None
+        self.latest_response = HttpResponsePacket(status_code=HttpStatusCode.NOT_FOUND)
 
         try:
             parsed_url = urlparse(url)
@@ -102,11 +110,19 @@ class WebBrowser(Application):
         payload = HttpRequestPacket(request_method=HttpRequestMethod.GET, request_url=url)
 
         # send request
-        return self.send(
+        if self.send(
             payload=payload,
             dest_ip_address=self.domain_name_ip_address,
             dest_port=parsed_url.port if parsed_url.port else Port.HTTP,
-        )
+        ):
+            self.sys_log.info(
+                f"{self.name}: Received HTTP {payload.request_method.name} "
+                f"Response {payload.request_url} - {self.latest_response.status_code.value}"
+            )
+            return self.latest_response.status_code is HttpStatusCode.OK
+        else:
+            self.sys_log.error(f"Error sending Http Packet {str(payload)}")
+            return False
 
     def send(
         self,