#1943: apply suggestions from PR + fixing FTP bug + elaborating

src/primaite/simulator/network/hardware/nodes/computer.py

@@ -2,7 +2,6 @@ from primaite.simulator.network.hardware.base import NIC, Node
 from primaite.simulator.system.applications.web_browser import WebBrowser
 from primaite.simulator.system.services.dns.dns_client import DNSClient
 from primaite.simulator.system.services.ftp.ftp_client import FTPClient
-from primaite.simulator.system.services.ftp.ftp_server import FTPServer
 
 
 class Computer(Node):
@@ -49,7 +48,6 @@ class Computer(Node):
 
         # FTP
         self.software_manager.install(FTPClient)
-        self.software_manager.install(FTPServer)
 
         # Web Browser
         self.software_manager.install(WebBrowser)

src/primaite/simulator/network/hardware/nodes/router.py

@@ -596,8 +596,6 @@ class Router(Node):
         self.arp.nics = self.nics
         self.icmp.arp = self.arp
 
-        self._install_system_software()
-
     def _get_port_of_nic(self, target_nic: NIC) -> Optional[int]:
         """
         Retrieve the port number for a given NIC.

src/primaite/simulator/network/hardware/nodes/switch.py

@@ -34,8 +34,6 @@ class Switch(Node):
             port.parent = self
             port.port_num = port_num
 
-        self._install_system_software()
-
     def show(self, markdown: bool = False):
         """
         Prints a table of the SwitchPorts on the Switch.

src/primaite/simulator/network/networks.py

@@ -11,6 +11,7 @@ from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.applications.database_client import DatabaseClient
 from primaite.simulator.system.services.database.database_service import DatabaseService
 from primaite.simulator.system.services.dns.dns_server import DNSServer
+from primaite.simulator.system.services.ftp.ftp_server import FTPServer
 from primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot
 from primaite.simulator.system.services.web_server.web_server import WebServer
 
@@ -268,6 +269,7 @@ def arcd_uc2_network() -> Network:
         dns_server=IPv4Address("192.168.1.10"),
     )
     backup_server.power_on()
+    backup_server.software_manager.install(FTPServer)
     network.connect(endpoint_b=backup_server.ethernet_port[1], endpoint_a=switch_1.switch_ports[4])
 
     # Security Suite

src/primaite/simulator/network/protocols/ftp.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Any, Optional
+from typing import Any, Optional, Union
 
 from primaite.simulator.network.protocols.packet import DataPacket
 
@@ -51,5 +51,5 @@ class FTPPacket(DataPacket):
     ftp_command_args: Optional[Any] = None
     """Arguments for command."""
 
-    status_code: FTPStatusCode = None
+    status_code: Union[FTPStatusCode, None] = None
     """Status of the response."""