Merge branch 'feature/1816_Database-Service-(Network-and-User-Interaction)' into feature/1752-dns-server-and-client

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

@@ -1,8 +1,9 @@
+import json
 import logging
 from pathlib import Path
-from typing import Optional
+from typing import Any, Dict, List, Optional
 
-from primaite.simulator import TEMP_SIM_OUTPUT
+from primaite.simulator import SIM_OUTPUT
 
 
 class _JSONFilter(logging.Filter):
@@ -51,6 +52,18 @@ class PacketCapture:
 
         self.logger.addFilter(_JSONFilter())
 
+    def read(self) -> List[Dict[str, Any]]:
+        """
+        Read packet capture logs and return them as a list of dictionaries.
+
+        :return: List of frames captured, represented as dictionaries.
+        """
+        frames = []
+        with open(self._get_log_path(), "r") as file:
+            while line := file.readline():
+                frames.append(json.loads(line.rstrip()))
+        return frames
+
     @property
     def _logger_name(self) -> str:
         """Get PCAP the logger name."""
@@ -62,7 +75,7 @@ class PacketCapture:
 
     def _get_log_path(self) -> Path:
         """Get the path for the log file."""
-        root = TEMP_SIM_OUTPUT / self.hostname
+        root = SIM_OUTPUT / self.hostname
         root.mkdir(exist_ok=True, parents=True)
         return root / f"{self._logger_name}.log"
 

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

@@ -3,6 +3,7 @@ from typing import Any, Dict, Optional, Tuple, TYPE_CHECKING, Union
 
 from prettytable import MARKDOWN, PrettyTable
 
+from primaite.simulator.file_system.file_system import FileSystem
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.applications.application import Application
@@ -22,7 +23,7 @@ ServiceClass = TypeVar("ServiceClass", bound=Service)
 class SoftwareManager:
     """A class that manages all running Services and Applications on a Node and facilitates their communication."""
 
-    def __init__(self, session_manager: "SessionManager", sys_log: "SysLog"):
+    def __init__(self, session_manager: "SessionManager", sys_log: SysLog, file_system: FileSystem):
         """
         Initialize a new instance of SoftwareManager.
 
@@ -33,6 +34,7 @@ class SoftwareManager:
         self.applications: Dict[str, Application] = {}
         self.port_protocol_mapping: Dict[Tuple[Port, IPProtocol], Union[Service, Application]] = {}
         self.sys_log: SysLog = sys_log
+        self.file_system: FileSystem = file_system
 
     def add_service(self, service_class: Type[ServiceClass]):
         """
@@ -40,7 +42,7 @@ class SoftwareManager:
 
         :param: service_class: The class of the service to add
         """
-        service = service_class(software_manager=self, sys_log=self.sys_log)
+        service = service_class(software_manager=self, sys_log=self.sys_log, file_system=self.file_system)
 
         service.software_manager = self
         self.services[service.name] = service
@@ -108,9 +110,10 @@ class SoftwareManager:
         """
         receiver: Optional[Union[Service, Application]] = self.port_protocol_mapping.get((port, protocol), None)
         if receiver:
-            receiver.receive_payload(payload=payload, session_id=session_id)
+            receiver.receive(payload=payload, session_id=session_id)
         else:
             self.sys_log.error(f"No service or application found for port {port} and protocol {protocol}")
+        pass
 
     def show(self, markdown: bool = False):
         """

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

@@ -3,7 +3,7 @@ from pathlib import Path
 
 from prettytable import MARKDOWN, PrettyTable
 
-from primaite.simulator import TEMP_SIM_OUTPUT
+from primaite.simulator import SIM_OUTPUT
 
 
 class _NotJSONFilter(logging.Filter):
@@ -81,7 +81,7 @@ class SysLog:
 
         :return: Path object representing the location of the log file.
         """
-        root = TEMP_SIM_OUTPUT / self.hostname
+        root = SIM_OUTPUT / self.hostname
         root.mkdir(exist_ok=True, parents=True)
         return root / f"{self.hostname}_sys.log"