Merge remote-tracking branch 'origin/dev' into feature/915_PRI-31_Packaging_Deployment

# Conflicts:
#	docs/source/about.rst
#	src/primaite/main.py
#	src/primaite/nodes/node.py

src/primaite/common/config_values_main.py

@@ -85,7 +85,10 @@ class ConfigValuesMain(object):
         # Patching / Reset
         self.os_patching_duration = 0  # The time taken to patch the OS
         self.node_reset_duration = 0  # The time taken to reset a node (hardware)
+        self.node_booting_duration = 0  # The Time taken to turn on the node
+        self.node_shutdown_duration = 0  # The time taken to turn off the node
         self.service_patching_duration = 0  # The time taken to patch a service
         self.file_system_repairing_limit = 0  # The time take to repair a file
         self.file_system_restoring_limit = 0  # The time take to restore a file
         self.file_system_scanning_limit = 0  # The time taken to scan the file system
+

src/primaite/common/enums.py

@@ -35,6 +35,8 @@ class HardwareState(Enum):
     ON = 1
     OFF = 2
     RESETTING = 3
+    SHUTTING_DOWN = 4
+    BOOTING = 5
 
 
 class SoftwareState(Enum):

src/primaite/environment/primaite_env.py

@@ -1,6 +1,6 @@
 # Crown Copyright (C) Dstl 2022. DEFCON 703. Shared in confidence.
 """Main environment module containing the PRIMmary AI Training Evironment (Primaite) class."""
-
+import time
 import copy
 import csv
 import logging

src/primaite/nodes/active_node.py

@@ -210,3 +210,17 @@ class ActiveNode(Node):
             self.file_system_state_observed = self.file_system_state_actual
             self.file_system_scanning = False
             self.file_system_scanning_count = 0
+
+    def update_resetting_status(self):
+        """Updates the reset count & makes software and file state to GOOD."""
+        super().update_resetting_status()
+        if self.resetting_count <= 0:
+            self.file_system_state_actual = FileSystemState.GOOD
+            self.software_state = SoftwareState.GOOD
+
+    def update_booting_status(self):
+        """Updates the booting software and file state to GOOD."""
+        super().update_booting_status()
+        if self.booting_count <= 0:
+            self.file_system_state_actual = FileSystemState.GOOD
+            self.software_state = SoftwareState.GOOD

src/primaite/nodes/node.py

@@ -35,6 +35,8 @@ class Node:
         self.hardware_state: HardwareState = hardware_state
         self.resetting_count: int = 0
         self.config_values: TrainingConfig = config_values
+        self.booting_count: int = 0
+        self.shutting_down_count: int = 0
 
     def __repr__(self):
         """Returns the name of the node."""
@@ -42,11 +44,12 @@ class Node:
 
     def turn_on(self):
         """Sets the node state to ON."""
-        self.hardware_state = HardwareState.ON
-
+        self.hardware_state = HardwareState.BOOTING
+        self.booting_count = self.config_values.node_booting_duration
     def turn_off(self):
         """Sets the node state to OFF."""
         self.hardware_state = HardwareState.OFF
+        self.shutting_down_count = self.config_values.node_shutdown_duration
 
     def reset(self):
         """Sets the node state to Resetting and starts the reset count."""
@@ -59,3 +62,17 @@ class Node:
         if self.resetting_count <= 0:
             self.resetting_count = 0
             self.hardware_state = HardwareState.ON
+
+    def update_booting_status(self):
+        """Updates the booting count"""
+        self.booting_count -= 1
+        if self.booting_count <= 0:
+            self.booting_count = 0
+            self.hardware_state = HardwareState.ON
+
+    def update_shutdown_status(self):
+        """Updates the shutdown count"""
+        self.shutting_down_count -= 1
+        if self.shutting_down_count <= 0:
+            self.shutting_down_count = 0
+            self.hardware_state = HardwareState.OFF

src/primaite/nodes/service_node.py

@@ -188,3 +188,15 @@ class ServiceNode(ActiveNode):
         for service_key, service_value in self.services.items():
             if service_value.software_state == SoftwareState.PATCHING:
                 service_value.reduce_patching_count()
+
+    def update_resetting_status(self):
+        super().update_resetting_status()
+        if self.resetting_count <= 0:
+            for service in self.services.values():
+                service.software_state = SoftwareState.GOOD
+
+    def update_booting_status(self):
+        super().update_booting_status()
+        if self.booting_count <= 0:
+            for service in self.services.values():
+                service.software_state =SoftwareState.GOOD