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

#1859 - Added the call to file system reset

Browse Source
This commit is contained in:
Chris McCarthy
2023-11-28 09:45:45 +00:00
parent 37663c941d
commit 517f99b04b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/primaite/simulator/network/hardware/base.py
View File

@@ -1009,6 +1009,8 @@ class Node(SimComponent):
for software in self.software_manager.software.values(): for software in self.software_manager.software.values():
software.set_original_state() software.set_original_state()
self.file_system.set_original_state()
for nic in self.nics.values(): for nic in self.nics.values():
nic.set_original_state() nic.set_original_state()
@@ -1039,13 +1041,18 @@ class Node(SimComponent):
# Reset Session Manager # Reset Session Manager
self.session_manager.clear() self.session_manager.clear()
# Reset software
for software in self.software_manager.software.values(): for software in self.software_manager.software.values():
software.reset_component_for_episode(episode) software.reset_component_for_episode(episode)
# Reset File System
self.file_system.reset_component_for_episode(episode)
# Reset all Nics # Reset all Nics
for nic in self.nics.values(): for nic in self.nics.values():
nic.reset_component_for_episode(episode) nic.reset_component_for_episode(episode)
#
if episode and self.sys_log: if episode and self.sys_log:
self.sys_log.current_episode = episode self.sys_log.current_episode = episode
self.sys_log.setup_logger() self.sys_log.setup_logger()

1
src/primaite/simulator/network/hardware/nodes/router.py
View File

@@ -818,6 +818,7 @@ class Router(Node):
nic.ip_address = ip_address nic.ip_address = ip_address
nic.subnet_mask = subnet_mask nic.subnet_mask = subnet_mask
self.sys_log.info(f"Configured port {port} with ip_address={ip_address}/{nic.ip_network.prefixlen}") 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): def enable_port(self, port: int):
""" """