#2326 - Network Interface port name/num fixed so that it carries through to sys log and PCAP outputs.

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

@@ -21,7 +21,13 @@ class PacketCapture:
     The PCAPs are logged to: <simulation output directory>/<hostname>/<hostname>_<ip address>_pcap.log
     """
 
-    def __init__(self, hostname: str, ip_address: Optional[str] = None, interface_num: Optional[int] = None):
+    def __init__(
+        self,
+        hostname: str,
+        ip_address: Optional[str] = None,
+        port_num: Optional[int] = None,
+        port_name: Optional[str] = None,
+    ):
         """
         Initialize the PacketCapture process.
 
@@ -32,9 +38,12 @@ class PacketCapture:
         "The hostname for which PCAP logs are being recorded."
         self.ip_address: str = ip_address
         "The IP address associated with the PCAP logs."
-        self.interface_num = interface_num
+        self.port_num = port_num
         "The interface num on the Node."
 
+        self.port_name = port_name
+        "The interface name on the Node."
+
         self.inbound_logger = None
         self.outbound_logger = None
 
@@ -42,6 +51,7 @@ class PacketCapture:
 
         self.setup_logger(outbound=False)
         self.setup_logger(outbound=True)
+        print(port_name)
 
     def setup_logger(self, outbound: bool = False):
         """Set up the logger configuration."""
@@ -79,10 +89,12 @@ class PacketCapture:
 
     def _get_logger_name(self, outbound: bool = False) -> str:
         """Get PCAP the logger name."""
+        if self.port_name:
+            return f"{self.hostname}_{self.port_name}_{'outbound' if outbound else 'inbound'}_pcap"
         if self.ip_address:
             return f"{self.hostname}_{self.ip_address}_{'outbound' if outbound else 'inbound'}_pcap"
-        if self.interface_num:
-            return f"{self.hostname}_port-{self.interface_num}_{'outbound' if outbound else 'inbound'}_pcap"
+        if self.port_num:
+            return f"{self.hostname}_port-{self.port_num}_{'outbound' if outbound else 'inbound'}_pcap"
         return f"{self.hostname}_{'outbound' if outbound else 'inbound'}_pcap"
 
     def _get_log_path(self, outbound: bool = False) -> Path: