oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue where data manipulation was always executing

Browse Source
This commit is contained in:
Marek Wolan
2024-01-09 17:10:12 +00:00
parent daa34385e5
commit e73783f6fa
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/primaite/simulator/system/services/red_services/data_manipulation_bot.py
View File

@@ -73,7 +73,7 @@ class DataManipulationBot(DatabaseClient):
def _init_request_manager(self) -> RequestManager: def _init_request_manager(self) -> RequestManager:
rm = super()._init_request_manager() rm = super()._init_request_manager()
rm.add_request(name="execute", request_type=RequestType(func=lambda request, context: self.run())) rm.add_request(name="execute", request_type=RequestType(func=lambda request, context: self.attack()))
return rm return rm
@@ -169,6 +169,12 @@ class DataManipulationBot(DatabaseClient):
Calls the parent classes execute method before starting the application loop. Calls the parent classes execute method before starting the application loop.
""" """
super().run() super().run()
def attack(self):
"""Perform the attack steps after opening the application."""
if not self._can_perform_action():
_LOGGER.debug("Data manipulation application attempted to execute but it cannot perform actions right now.")
self.run()
self._application_loop() self._application_loop()
def _application_loop(self): def _application_loop(self):
@@ -199,4 +205,4 @@ class DataManipulationBot(DatabaseClient):
:param timestep: The timestep value to update the bot's state. :param timestep: The timestep value to update the bot's state.
""" """
self._application_loop() pass

2
src/primaite/simulator/system/software.py
View File

@@ -278,7 +278,7 @@ class IOSoftware(Software):
Returns true if the software can perform actions. Returns true if the software can perform actions.
""" """
if self.software_manager and self.software_manager.node.operating_state is NodeOperatingState.OFF: if self.software_manager and self.software_manager.node.operating_state is not NodeOperatingState.ON:
_LOGGER.debug(f"{self.name} Error: {self.software_manager.node.hostname} is not online.") _LOGGER.debug(f"{self.name} Error: {self.software_manager.node.hostname} is not online.")
return False return False
return True return True