From 517f99b04b9e8c2792ad70768a5e3bfa65f9e88a Mon Sep 17 00:00:00 2001 From: Chris McCarthy Date: Tue, 28 Nov 2023 09:45:45 +0000 Subject: [PATCH] #1859 - Added the call to file system reset --- src/primaite/simulator/network/hardware/base.py | 7 +++++++ src/primaite/simulator/network/hardware/nodes/router.py | 1 + 2 files changed, 8 insertions(+) diff --git a/src/primaite/simulator/network/hardware/base.py b/src/primaite/simulator/network/hardware/base.py index 09e2b12f..cb159b8b 100644 --- a/src/primaite/simulator/network/hardware/base.py +++ b/src/primaite/simulator/network/hardware/base.py @@ -1009,6 +1009,8 @@ class Node(SimComponent): for software in self.software_manager.software.values(): software.set_original_state() + self.file_system.set_original_state() + for nic in self.nics.values(): nic.set_original_state() @@ -1039,13 +1041,18 @@ 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) + # Reset all Nics for nic in self.nics.values(): nic.reset_component_for_episode(episode) + # if episode and self.sys_log: self.sys_log.current_episode = episode self.sys_log.setup_logger() diff --git a/src/primaite/simulator/network/hardware/nodes/router.py b/src/primaite/simulator/network/hardware/nodes/router.py index 667cf2bf..34b92a07 100644 --- a/src/primaite/simulator/network/hardware/nodes/router.py +++ b/src/primaite/simulator/network/hardware/nodes/router.py @@ -818,6 +818,7 @@ class Router(Node): nic.ip_address = ip_address nic.subnet_mask = subnet_mask self.sys_log.info(f"Configured port {port} with ip_address={ip_address}/{nic.ip_network.prefixlen}") + self.set_original_state() def enable_port(self, port: int): """