Merge remote-tracking branch 'origin/dev' into feature/1812-traverse-actions-dict

src/primaite/simulator/network/hardware/base.py

@@ -502,7 +502,9 @@ class Link(SimComponent):
     def _can_transmit(self, frame: Frame) -> bool:
         if self.is_up:
             frame_size_Mbits = frame.size_Mbits  # noqa - Leaving it as Mbits as this is how they're expressed
-            return self.current_load + frame_size_Mbits <= self.bandwidth
+            # return self.current_load + frame_size_Mbits <= self.bandwidth
+            # TODO: re add this check once packet size limiting and MTU checks are implemented
+            return True
         return False
 
     def transmit_frame(self, sender_nic: Union[NIC, SwitchPort], frame: Frame) -> bool:
@@ -942,6 +944,7 @@ class Node(SimComponent):
         super().__init__(**kwargs)
         self.arp.nics = self.nics
         self.session_manager.software_manager = self.software_manager
+        self._install_system_software()
 
     def _init_action_manager(self) -> ActionManager:
         # TODO: I see that this code is really confusing and hard to read right now... I think some of these things will
@@ -971,6 +974,10 @@ class Node(SimComponent):
 
         return am
 
+    def _install_system_software(self):
+        """Install System Software - software that is usually provided with the OS."""
+        pass
+
     def describe_state(self) -> Dict:
         """
         Produce a dictionary describing the current state of this object.

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

@@ -1,4 +1,6 @@
 from primaite.simulator.network.hardware.base import NIC, Node
+from primaite.simulator.system.services.dns.dns_client import DNSClient
+from primaite.simulator.system.services.ftp.ftp_client import FTPClient
 
 
 class Computer(Node):
@@ -36,3 +38,14 @@ class Computer(Node):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.connect_nic(NIC(ip_address=kwargs["ip_address"], subnet_mask=kwargs["subnet_mask"]))
+        self._install_system_software()
+
+    def _install_system_software(self):
+        """Install System Software - software that is usually provided with the OS."""
+        # DNS Client
+        self.software_manager.install(DNSClient)
+
+        # FTP
+        self.software_manager.install(FTPClient)
+
+        super()._install_system_software()