Merge remote-tracking branch 'devops/dev' into feature/1801-Database

# Conflicts:
#	src/primaite/simulator/network/container.py
#	src/primaite/simulator/network/hardware/base.py

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

@@ -22,16 +22,16 @@ class Session(SimComponent):
     source and destination IPs and ports.
 
     :param protocol: The IP protocol used in the session.
-    :param src_ip: The source IP address.
-    :param dst_ip: The destination IP address.
+    :param src_ip_address: The source IP address.
+    :param dst_ip_address: The destination IP address.
     :param src_port: The source port number (optional).
     :param dst_port: The destination port number (optional).
     :param connected: A flag indicating whether the session is connected.
     """
 
     protocol: IPProtocol
-    src_ip: IPv4Address
-    dst_ip: IPv4Address
+    src_ip_address: IPv4Address
+    dst_ip_address: IPv4Address
     src_port: Optional[Port]
     dst_port: Optional[Port]
     connected: bool = False
@@ -46,8 +46,14 @@ class Session(SimComponent):
         :param session_key: Tuple containing the session details.
         :return: A Session instance.
         """
-        protocol, src_ip, dst_ip, src_port, dst_port = session_key
-        return Session(protocol=protocol, src_ip=src_ip, dst_ip=dst_ip, src_port=src_port, dst_port=dst_port)
+        protocol, src_ip_address, dst_ip_address, src_port, dst_port = session_key
+        return Session(
+            protocol=protocol,
+            src_ip_address=src_ip_address,
+            dst_ip_address=dst_ip_address,
+            src_port=src_port,
+            dst_port=dst_port,
+        )
 
     def describe_state(self) -> Dict:
         """
@@ -108,8 +114,8 @@ class SessionManager:
         :return: A tuple containing the session key.
         """
         protocol = frame.ip.protocol
-        src_ip = frame.ip.src_ip
-        dst_ip = frame.ip.dst_ip
+        src_ip_address = frame.ip.src_ip_address
+        dst_ip_address = frame.ip.dst_ip_address
         if protocol == IPProtocol.TCP:
             if from_source:
                 src_port = frame.tcp.src_port
@@ -127,7 +133,7 @@ class SessionManager:
         else:
             src_port = None
             dst_port = None
-        return protocol, src_ip, dst_ip, src_port, dst_port
+        return protocol, src_ip_address, dst_ip_address, src_port, dst_port
 
     def receive_payload_from_software_manager(self, payload: Any, session_id: Optional[int] = None):
         """

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

@@ -1,6 +1,8 @@
 import logging
 from pathlib import Path
 
+from prettytable import MARKDOWN, PrettyTable
+
 from primaite.simulator import TEMP_SIM_OUTPUT
 
 
@@ -43,7 +45,7 @@ class SysLog:
         file_handler = logging.FileHandler(filename=log_path)
         file_handler.setLevel(logging.DEBUG)
 
-        log_format = "%(asctime)s %(levelname)s: %(message)s"
+        log_format = "%(asctime)s::%(levelname)s::%(message)s"
         file_handler.setFormatter(logging.Formatter(log_format))
 
         self.logger = logging.getLogger(f"{self.hostname}_sys_log")
@@ -52,6 +54,27 @@ class SysLog:
 
         self.logger.addFilter(_NotJSONFilter())
 
+    def show(self, last_n: int = 10, markdown: bool = False):
+        """
+        Print the Node Sys Log as a table.
+
+        Generate and print PrettyTable instance that shows the Nodes Sys Log, with columns Timestamp, Level,
+        and Massage.
+
+        :param markdown: Use Markdown style in table output. Defaults to False.
+        """
+        table = PrettyTable(["Timestamp", "Level", "Message"])
+        if markdown:
+            table.set_style(MARKDOWN)
+        table.align = "l"
+        table.title = f"{self.hostname} Sys Log"
+        if self._get_log_path().exists():
+            with open(self._get_log_path()) as file:
+                lines = file.readlines()
+            for line in lines[-last_n:]:
+                table.add_row(line.strip().split("::"))
+        print(table)
+
     def _get_log_path(self) -> Path:
         """
         Constructs the path for the log file based on the hostname.