Add port and protocol custom validators

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

@@ -7,10 +7,10 @@ from primaite.interface.request import RequestFormat, RequestResponse
 from primaite.simulator.core import RequestManager, RequestType
 from primaite.simulator.file_system.file_system import File
 from primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode
-from primaite.simulator.network.transmission.network_layer import IPProtocol
-from primaite.simulator.network.transmission.transport_layer import Port
+from primaite.simulator.network.transmission.transport_layer import PORT_LOOKUP
 from primaite.simulator.system.core.software_manager import SoftwareManager
 from primaite.simulator.system.services.ftp.ftp_service import FTPServiceABC
+from primaite.utils.validators import PROTOCOL_LOOKUP
 
 _LOGGER = getLogger(__name__)
 
@@ -25,8 +25,8 @@ class FTPClient(FTPServiceABC):
 
     def __init__(self, **kwargs):
         kwargs["name"] = "FTPClient"
-        kwargs["port"] = Port["FTP"]
-        kwargs["protocol"] = IPProtocol["TCP"]
+        kwargs["port"] = PORT_LOOKUP["FTP"]
+        kwargs["protocol"] = PROTOCOL_LOOKUP["TCP"]
         super().__init__(**kwargs)
         self.start()
 
@@ -104,7 +104,7 @@ class FTPClient(FTPServiceABC):
     def _connect_to_server(
         self,
         dest_ip_address: Optional[IPv4Address] = None,
-        dest_port: Optional[int] = Port["FTP"],
+        dest_port: Optional[int] = PORT_LOOKUP["FTP"],
         session_id: Optional[str] = None,
         is_reattempt: Optional[bool] = False,
     ) -> bool:
@@ -124,7 +124,7 @@ class FTPClient(FTPServiceABC):
 
         # normally FTP will choose a random port for the transfer, but using the FTP command port will do for now
         # create FTP packet
-        payload: FTPPacket = FTPPacket(ftp_command=FTPCommand.PORT, ftp_command_args=Port["FTP"])
+        payload: FTPPacket = FTPPacket(ftp_command=FTPCommand.PORT, ftp_command_args=PORT_LOOKUP["FTP"])
 
         if self.send(payload=payload, dest_ip_address=dest_ip_address, dest_port=dest_port, session_id=session_id):
             if payload.status_code == FTPStatusCode.OK:
@@ -152,7 +152,7 @@ class FTPClient(FTPServiceABC):
             return False
 
     def _disconnect_from_server(
-        self, dest_ip_address: Optional[IPv4Address] = None, dest_port: Optional[int] = Port["FTP"]
+        self, dest_ip_address: Optional[IPv4Address] = None, dest_port: Optional[int] = PORT_LOOKUP["FTP"]
     ) -> bool:
         """
         Connects the client from a given FTP server.
@@ -179,7 +179,7 @@ class FTPClient(FTPServiceABC):
         src_file_name: str,
         dest_folder_name: str,
         dest_file_name: str,
-        dest_port: Optional[int] = Port["FTP"],
+        dest_port: Optional[int] = PORT_LOOKUP["FTP"],
         session_id: Optional[str] = None,
     ) -> bool:
         """
@@ -241,7 +241,7 @@ class FTPClient(FTPServiceABC):
         src_file_name: str,
         dest_folder_name: str,
         dest_file_name: str,
-        dest_port: Optional[int] = Port["FTP"],
+        dest_port: Optional[int] = PORT_LOOKUP["FTP"],
     ) -> bool:
         """
         Request a file from a target IP address.