#1943: web server + client + tests + a few improvements to syslogging

src/primaite/simulator/system/services/ftp/ftp_service.py

@@ -5,7 +5,6 @@ from typing import Optional
 from primaite.simulator.file_system.file_system import File
 from primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode
 from primaite.simulator.network.transmission.transport_layer import Port
-from primaite.simulator.system.core.software_manager import SoftwareManager
 from primaite.simulator.system.services.service import Service
 
 
@@ -54,7 +53,7 @@ class FTPServiceABC(Service, ABC):
                 size=file_size,
             )
             self.sys_log.info(
-                f"Created item in {self.sys_log.hostname}: {payload.ftp_command_args['dest_folder_name']}/"
+                f"{self.name}: Created item in {self.sys_log.hostname}: {payload.ftp_command_args['dest_folder_name']}/"
                 f"{payload.ftp_command_args['dest_file_name']}"
             )
             # file should exist
@@ -103,12 +102,12 @@ class FTPServiceABC(Service, ABC):
             },
             packet_payload_size=file.sim_size,
         )
-        software_manager: SoftwareManager = self.software_manager
-        software_manager.send_payload_to_session_manager(
+        self.sys_log.info(f"{self.name}: Sending file {file.folder.name}/{file.name}")
+        response = self.send(
             payload=payload, dest_ip_address=dest_ip_address, dest_port=dest_port, session_id=session_id
         )
 
-        if payload.status_code == FTPStatusCode.OK:
+        if response and payload.status_code == FTPStatusCode.OK:
             return True
 
         return False
@@ -146,3 +145,27 @@ class FTPServiceABC(Service, ABC):
         except Exception as e:
             self.sys_log.error(f"Unable to retrieve file from {self.sys_log.hostname}: {e}")
             return False
+
+    def send(
+        self,
+        payload: FTPPacket,
+        session_id: Optional[str] = None,
+        dest_ip_address: Optional[IPv4Address] = None,
+        dest_port: Optional[Port] = None,
+        **kwargs,
+    ) -> bool:
+        """
+        Sends a payload to the SessionManager.
+
+        :param payload: The payload to be sent.
+        :param dest_ip_address: The ip address of the payload destination.
+        :param dest_port: The port of the payload destination.
+        :param session_id: The Session ID the payload is to originate from. Optional.
+
+        :return: True if successful, False otherwise.
+        """
+        self.sys_log.info(f"{self.name}: Sending FTP {payload.ftp_command.name} {payload.ftp_command_args}")
+
+        return super().send(
+            payload=payload, dest_ip_address=dest_ip_address, dest_port=dest_port, session_id=session_id, **kwargs
+        )