#2550 Backport changes into core

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

@@ -1,6 +1,6 @@
 from abc import abstractmethod
 from enum import Enum
-from typing import Any, Dict, Set
+from typing import Any, Dict, Optional, Set
 
 from primaite.interface.request import RequestResponse
 from primaite.simulator.core import RequestManager, RequestType
@@ -33,6 +33,10 @@ class Application(IOSoftware):
     "The number of times the application has been executed. Default is 0."
     groups: Set[str] = set()
     "The set of groups to which the application belongs."
+    install_duration: int = 2
+    "How long it takes to install the application."
+    install_countdown: Optional[int] = None
+    "The countdown to the end of the installation process. None if not currently installing"
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -76,6 +80,12 @@ class Application(IOSoftware):
         :param timestep: The current timestep of the simulation.
         """
         super().apply_timestep(timestep=timestep)
+        if self.operating_state is ApplicationOperatingState.INSTALLING:
+            self.install_countdown -= 1
+            if self.install_countdown <= 0:
+                self.operating_state = ApplicationOperatingState.RUNNING
+                self.health_state_actual = SoftwareHealthState.GOOD
+                self.install_countdown = None
 
     def pre_timestep(self, timestep: int) -> None:
         """Apply pre-timestep logic."""
@@ -129,6 +139,7 @@ class Application(IOSoftware):
         super().install()
         if self.operating_state == ApplicationOperatingState.CLOSED:
             self.operating_state = ApplicationOperatingState.INSTALLING
+            self.install_countdown = self.install_duration
 
     def receive(self, payload: Any, session_id: str, **kwargs) -> bool:
         """

src/primaite/simulator/system/applications/red_applications/dos_bot.py

@@ -177,4 +177,5 @@ class DoSBot(DatabaseClient):
 
         :param timestep: The timestep value to update the bot's state.
         """
+        super().apply_timestep(timestep=timestep)
         self._application_loop()

src/primaite/simulator/system/applications/red_applications/ransomware_script.py

@@ -118,14 +118,6 @@ class RansomwareScript(Application):
             self.sys_log.info(f"{self.name}: Activated!")
             self.attack_stage = RansomwareAttackStage.ACTIVATE
 
-    def apply_timestep(self, timestep: int) -> None:
-        """
-        Apply a timestep to the bot, triggering the application loop.
-
-        :param timestep: The timestep value to update the bot's state.
-        """
-        pass
-
     def run(self) -> bool:
         """Calls the parent classes execute method before starting the application loop."""
         super().run()