Merge remote-tracking branch 'origin/dev' into feature/2084-add-more-tests-to-make-primaite-more-robust

src/primaite/simulator/network/container.py

@@ -12,6 +12,8 @@ from primaite.simulator.network.hardware.nodes.computer import Computer
 from primaite.simulator.network.hardware.nodes.router import Router
 from primaite.simulator.network.hardware.nodes.server import Server
 from primaite.simulator.network.hardware.nodes.switch import Switch
+from primaite.simulator.system.applications.application import Application
+from primaite.simulator.system.services.service import Service
 
 _LOGGER = getLogger(__name__)
 
@@ -57,6 +59,18 @@ class Network(SimComponent):
         for link in self.links.values():
             link.reset_component_for_episode(episode)
 
+        for node in self.nodes.values():
+            node.power_on()
+
+            for nic in node.nics.values():
+                nic.enable()
+            # Reset software
+            for software in node.software_manager.software.values():
+                if isinstance(software, Service):
+                    software.start()
+                elif isinstance(software, Application):
+                    software.run()
+
     def _init_request_manager(self) -> RequestManager:
         rm = super()._init_request_manager()
         self._node_request_manager = RequestManager()

src/primaite/simulator/network/hardware/base.py

@@ -1019,6 +1019,8 @@ class Node(SimComponent):
 
     def reset_component_for_episode(self, episode: int):
         """Reset the original state of the SimComponent."""
+        super().reset_component_for_episode(episode)
+
         # Reset ARP Cache
         self.arp.clear()
 
@@ -1028,10 +1030,6 @@ class Node(SimComponent):
         # Reset Session Manager
         self.session_manager.clear()
 
-        # Reset software
-        for software in self.software_manager.software.values():
-            software.reset_component_for_episode(episode)
-
         # Reset File System
         self.file_system.reset_component_for_episode(episode)
 
@@ -1039,13 +1037,13 @@ class Node(SimComponent):
         for nic in self.nics.values():
             nic.reset_component_for_episode(episode)
 
-        #
+        for software in self.software_manager.software.values():
+            software.reset_component_for_episode(episode)
+
         if episode and self.sys_log:
             self.sys_log.current_episode = episode
             self.sys_log.setup_logger()
 
-        super().reset_component_for_episode(episode)
-
     def _init_request_manager(self) -> RequestManager:
         # TODO: I see that this code is really confusing and hard to read right now... I think some of these things will
         # need a better name and better documentation.

src/primaite/simulator/network/hardware/nodes/router.py

@@ -678,8 +678,9 @@ class Router(Node):
         """Sets the original state."""
         self.acl.set_original_state()
         self.route_table.set_original_state()
+        super().set_original_state()
         vals_to_include = {"num_ports"}
-        self._original_state = self.model_dump(include=vals_to_include)
+        self._original_state.update(self.model_dump(include=vals_to_include))
 
     def reset_component_for_episode(self, episode: int):
         """Reset the original state of the SimComponent."""