#1859 - First pass at an implementation of the full reset method. Will now start testing...

src/primaite/simulator/system/core/packet_capture.py

@@ -34,9 +34,12 @@ class PacketCapture:
         "The IP address associated with the PCAP logs."
         self.switch_port_number = switch_port_number
         "The SwitchPort number."
-        self._setup_logger()
 
-    def _setup_logger(self):
+        self.current_episode: int = 1
+
+        self.setup_logger()
+
+    def setup_logger(self):
         """Set up the logger configuration."""
         log_path = self._get_log_path()
 
@@ -75,7 +78,7 @@ class PacketCapture:
 
     def _get_log_path(self) -> Path:
         """Get the path for the log file."""
-        root = SIM_OUTPUT.path / self.hostname
+        root = SIM_OUTPUT.path / f"episode_{self.current_episode}" / self.hostname
         root.mkdir(exist_ok=True, parents=True)
         return root / f"{self._logger_name}.log"
 

src/primaite/simulator/system/core/session_manager.py

@@ -93,6 +93,11 @@ class SessionManager:
         """
         pass
 
+    def clear(self):
+        """Clears the sessions."""
+        self.sessions_by_key.clear()
+        self.sessions_by_uuid.clear()
+
     @staticmethod
     def _get_session_key(
         frame: Frame, inbound_frame: bool = True

src/primaite/simulator/system/core/sys_log.py

@@ -31,9 +31,10 @@ class SysLog:
         :param hostname: The hostname associated with the system logs being recorded.
         """
         self.hostname = hostname
-        self._setup_logger()
+        self.current_episode: int = 1
+        self.setup_logger()
 
-    def _setup_logger(self):
+    def setup_logger(self):
         """
         Configures the logger for this SysLog instance.
 
@@ -80,7 +81,7 @@ class SysLog:
 
         :return: Path object representing the location of the log file.
         """
-        root = SIM_OUTPUT.path / self.hostname
+        root = SIM_OUTPUT.path / f"episode_{self.current_episode}" / self.hostname
         root.mkdir(exist_ok=True, parents=True)
         return root / f"{self.hostname}_sys.log"