Merge remote-tracking branch 'origin/dev' into feature/2470-refactor-syslog-to-be-able-to-leverage-a-configured-log-level

src/primaite/simulator/network/hardware/nodes/host/host_node.py

@@ -316,6 +316,16 @@ class HostNode(Node):
         super().__init__(**kwargs)
         self.connect_nic(NIC(ip_address=ip_address, subnet_mask=subnet_mask))
 
+    @property
+    def arp(self) -> Optional[ARP]:
+        """
+        Return the ARP Cache of the HostNode.
+
+        :return: ARP Cache for given HostNode
+        :rtype: Optional[ARP]
+        """
+        return self.software_manager.software.get("ARP")
+
     def _install_system_software(self):
         """
         Installs the system software and network services typically found on an operating system.

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

@@ -1,7 +1,9 @@
 from abc import abstractmethod
+from typing import Optional
 
 from primaite.simulator.network.hardware.base import NetworkInterface, Node
 from primaite.simulator.network.transmission.data_link_layer import Frame
+from primaite.simulator.system.services.arp.arp import ARP
 
 
 class NetworkNode(Node):
@@ -28,3 +30,13 @@ class NetworkNode(Node):
         :type from_network_interface: NetworkInterface
         """
         pass
+
+    @property
+    def arp(self) -> Optional[ARP]:
+        """
+        Return the ARP Cache of the NetworkNode.
+
+        :return: ARP Cache for given NetworkNode
+        :rtype: Optional[ARP]
+        """
+        return self.software_manager.software.get("ARP")

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

@@ -1237,8 +1237,7 @@ class Router(NetworkNode):
         icmp: RouterICMP = self.software_manager.icmp  # noqa
         icmp.router = self
         self.software_manager.install(RouterARP)
-        arp: RouterARP = self.software_manager.arp  # noqa
-        arp.router = self
+        self.arp.router = self
 
     def _set_default_acl(self):
         """