Merge remote-tracking branch 'origin/dev' into feature/2258-dosbot-cannot-be-added-via-configuration-file

2024-02-12 08:57:47 +00:00
parent d1c3f891bf a960741f66
commit 66a3e8d02c
108 changed files with 3868 additions and 2891 deletions
--- a/tests/integration_tests/component_creation/test_action_integration.py
+++ b/tests/integration_tests/component_creation/test_action_integration.py
@@ -1,9 +1,7 @@
-import pytest
-
 from primaite.simulator.core import RequestType
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.server import Server
-from primaite.simulator.network.hardware.nodes.switch import Switch
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
+from primaite.simulator.network.hardware.nodes.network.switch import Switch
 from primaite.simulator.sim_container import Simulation
 from primaite.simulator.system.services.database.database_service import DatabaseService

@@ -27,9 +25,9 @@ def test_passing_actions_down(monkeypatch) -> None:
    downloads_folder = pc1.file_system.create_folder("downloads")
    pc1.file_system.create_file("bermuda_triangle.png", folder_name="downloads")

-    sim.network.connect(pc1.ethernet_port[1], s1.switch_ports[1])
-    sim.network.connect(pc2.ethernet_port[1], s1.switch_ports[2])
-    sim.network.connect(s1.switch_ports[3], srv.ethernet_port[1])
+    sim.network.connect(pc1.network_interface[1], s1.network_interface[1])
+    sim.network.connect(pc2.network_interface[1], s1.network_interface[2])
+    sim.network.connect(s1.network_interface[3], srv.network_interface[1])

    # call this method to make sure no errors occur.
    sim._request_manager.get_request_types_recursively()
--- a/tests/integration_tests/game_layer/test_actions.py
+++ b/tests/integration_tests/game_layer/test_actions.py
@@ -21,10 +21,10 @@ from primaite.game.agent.rewards import RewardFunction
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.router import ACLAction, Router
-from primaite.simulator.network.hardware.nodes.server import Server
-from primaite.simulator.network.hardware.nodes.switch import Switch
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
+from primaite.simulator.network.hardware.nodes.network.router import ACLAction, Router
+from primaite.simulator.network.hardware.nodes.network.switch import Switch
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.sim_container import Simulation
@@ -227,7 +227,7 @@ def test_network_nic_disable_integration(game_and_agent: Tuple[PrimaiteGame, Pro
    game.step()

    # 3: Check that the NIC is disabled, and that client 1 cannot access example.com
-    assert client_1.ethernet_port[1].enabled == False
+    assert client_1.network_interface[1].enabled == False
    assert not browser.get_webpage()
    assert not client_1.ping("10.0.2.2")
    assert not client_1.ping("10.0.2.3")
@@ -243,7 +243,7 @@ def test_network_nic_enable_integration(game_and_agent: Tuple[PrimaiteGame, Prox

    # 1: Disable client_1 nic
    client_1 = game.simulation.network.get_node_by_hostname("client_1")
-    client_1.ethernet_port[1].disable()
+    client_1.network_interface[1].disable()
    assert not client_1.ping("10.0.2.2")

    # 2: Use action to enable nic
@@ -258,7 +258,7 @@ def test_network_nic_enable_integration(game_and_agent: Tuple[PrimaiteGame, Prox
    game.step()

    # 3: Check that the NIC is enabled, and that client 1 can ping again
-    assert client_1.ethernet_port[1].enabled == True
+    assert client_1.network_interface[1].enabled == True
    assert client_1.ping("10.0.2.3")


--- a/tests/integration_tests/game_layer/test_observations.py
+++ b/tests/integration_tests/game_layer/test_observations.py
@@ -1,7 +1,7 @@
 from gymnasium import spaces

 from primaite.game.agent.observations import FileObservation
-from primaite.simulator.network.hardware.nodes.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.sim_container import Simulation


--- a/tests/integration_tests/game_layer/test_rewards.py
+++ b/tests/integration_tests/game_layer/test_rewards.py
@@ -1,5 +1,5 @@
-from primaite.game.agent.rewards import RewardFunction, WebpageUnavailablePenalty
-from primaite.simulator.network.hardware.nodes.router import ACLAction, Router
+from primaite.game.agent.rewards import WebpageUnavailablePenalty
+from primaite.simulator.network.hardware.nodes.network.router import ACLAction, Router
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
 from tests.conftest import ControlledAgent
--- a/tests/integration_tests/network/test_broadcast.py
+++ b/tests/integration_tests/network/test_broadcast.py
@@ -4,9 +4,9 @@ from typing import Any, Dict, List, Tuple
 import pytest

 from primaite.simulator.network.container import Network
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.server import Server
-from primaite.simulator.network.hardware.nodes.switch import Switch
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
+from primaite.simulator.network.hardware.nodes.network.switch import Switch
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.applications.application import Application
@@ -37,11 +37,7 @@ class BroadcastService(Service):

    def broadcast(self, ip_network: IPv4Network):
        # Send a broadcast payload to an entire IP network
-        super().send(
-            payload="broadcast",
-            dest_ip_address=ip_network,
-            dest_port=Port.HTTP,
-        )
+        super().send(payload="broadcast", dest_ip_address=ip_network, dest_port=Port.HTTP, ip_protocol=self.protocol)


 class BroadcastClient(Application):
@@ -110,9 +106,9 @@ def broadcast_network() -> Network:
    switch_1 = Switch(hostname="switch_1", num_ports=6, start_up_duration=0)
    switch_1.power_on()

-    network.connect(endpoint_a=client_1.ethernet_port[1], endpoint_b=switch_1.switch_ports[1])
-    network.connect(endpoint_a=client_2.ethernet_port[1], endpoint_b=switch_1.switch_ports[2])
-    network.connect(endpoint_a=server_1.ethernet_port[1], endpoint_b=switch_1.switch_ports[3])
+    network.connect(endpoint_a=client_1.network_interface[1], endpoint_b=switch_1.network_interface[1])
+    network.connect(endpoint_a=client_2.network_interface[1], endpoint_b=switch_1.network_interface[2])
+    network.connect(endpoint_a=server_1.network_interface[1], endpoint_b=switch_1.network_interface[3])

    return network

--- a/tests/integration_tests/network/test_frame_transmission.py
+++ b/tests/integration_tests/network/test_frame_transmission.py
@@ -1,41 +1,62 @@
-from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
+from primaite.simulator.network.container import Network
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.host_node import NIC
+from primaite.simulator.network.hardware.nodes.host.server import Server
+from primaite.simulator.network.hardware.nodes.network.switch import Switch


 def test_node_to_node_ping():
-    """Tests two Nodes are able to ping each other."""
-    node_a = Node(hostname="node_a", operating_state=NodeOperatingState.ON)
-    nic_a = NIC(ip_address="192.168.0.10", subnet_mask="255.255.255.0", operating_state=NodeOperatingState.ON)
-    node_a.connect_nic(nic_a)
+    """Tests two Computers are able to ping each other."""
+    network = Network()

-    node_b = Node(hostname="node_b", operating_state=NodeOperatingState.ON)
-    nic_b = NIC(ip_address="192.168.0.11", subnet_mask="255.255.255.0")
-    node_b.connect_nic(nic_b)
+    client_1 = Computer(
+        hostname="client_1",
+        ip_address="192.168.1.10",
+        subnet_mask="255.255.255.0",
+        default_gateway="192.168.1.1",
+        start_up_duration=0,
+    )
+    client_1.power_on()

-    Link(endpoint_a=nic_a, endpoint_b=nic_b)
+    server_1 = Server(
+        hostname="server_1",
+        ip_address="192.168.1.11",
+        subnet_mask="255.255.255.0",
+        default_gateway="192.168.1.1",
+        start_up_duration=0,
+    )
+    server_1.power_on()

-    assert node_a.ping("192.168.0.11")
+    switch_1 = Switch(hostname="switch_1", start_up_duration=0)
+    switch_1.power_on()
+
+    network.connect(endpoint_a=client_1.network_interface[1], endpoint_b=switch_1.network_interface[1])
+    network.connect(endpoint_a=server_1.network_interface[1], endpoint_b=switch_1.network_interface[2])
+
+    assert client_1.ping("192.168.1.11")


 def test_multi_nic():
-    """Tests that Nodes with multiple NICs can ping each other and the data go across the correct links."""
-    node_a = Node(hostname="node_a", operating_state=NodeOperatingState.ON)
-    nic_a = NIC(ip_address="192.168.0.10", subnet_mask="255.255.255.0")
-    node_a.connect_nic(nic_a)
+    """Tests that Computers with multiple NICs can ping each other and the data go across the correct links."""
+    network = Network()

-    node_b = Node(hostname="node_b", operating_state=NodeOperatingState.ON)
-    nic_b1 = NIC(ip_address="192.168.0.11", subnet_mask="255.255.255.0")
-    nic_b2 = NIC(ip_address="10.0.0.12", subnet_mask="255.0.0.0")
-    node_b.connect_nic(nic_b1)
-    node_b.connect_nic(nic_b2)
+    node_a = Computer(hostname="node_a", ip_address="192.168.0.10", subnet_mask="255.255.255.0", start_up_duration=0)
+    node_a.power_on()

-    node_c = Node(hostname="node_c", operating_state=NodeOperatingState.ON)
-    nic_c = NIC(ip_address="10.0.0.13", subnet_mask="255.0.0.0")
-    node_c.connect_nic(nic_c)
+    node_b = Computer(hostname="node_b", ip_address="192.168.0.11", subnet_mask="255.255.255.0", start_up_duration=0)
+    node_b.power_on()
+    node_b.connect_nic(NIC(ip_address="10.0.0.12", subnet_mask="255.0.0.0"))

-    Link(endpoint_a=nic_a, endpoint_b=nic_b1)
+    node_c = Computer(hostname="node_c", ip_address="10.0.0.13", subnet_mask="255.0.0.0", start_up_duration=0)
+    node_c.power_on()

-    Link(endpoint_a=nic_b2, endpoint_b=nic_c)
+    network.connect(node_a.network_interface[1], node_b.network_interface[1])
+    network.connect(node_b.network_interface[2], node_c.network_interface[1])

-    node_a.ping("192.168.0.11")
+    assert node_a.ping(node_b.network_interface[1].ip_address)

-    assert node_c.ping("10.0.0.12")
+    assert node_c.ping(node_b.network_interface[2].ip_address)
+
+    assert not node_a.ping(node_b.network_interface[2].ip_address)
+
+    assert not node_a.ping(node_c.network_interface[1].ip_address)
--- a/tests/integration_tests/network/test_link_connection.py
+++ b/tests/integration_tests/network/test_link_connection.py
@@ -1,24 +0,0 @@
-from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
-
-
-def test_link_up():
-    """Tests Nodes, NICs, and Links can all be connected and be in an enabled/up state."""
-    node_a = Node(hostname="node_a", operating_state=NodeOperatingState.ON)
-    nic_a = NIC(ip_address="192.168.0.10", subnet_mask="255.255.255.0")
-    node_a.connect_nic(nic_a)
-
-    node_b = Node(hostname="node_b", operating_state=NodeOperatingState.ON)
-    nic_b = NIC(ip_address="192.168.0.11", subnet_mask="255.255.255.0")
-    node_b.connect_nic(nic_b)
-
-    link = Link(endpoint_a=nic_a, endpoint_b=nic_b)
-
-    assert nic_a.enabled
-    assert nic_b.enabled
-    assert link.is_up
-
-
-def test_ping_between_computer_and_server(client_server):
-    computer, server = client_server
-
-    assert computer.ping(target_ip_address=server.nics[next(iter(server.nics))].ip_address)
--- a/tests/integration_tests/network/test_network_creation.py
+++ b/tests/integration_tests/network/test_network_creation.py
@@ -1,10 +1,7 @@
-import pytest
-
 from primaite.simulator.network.container import Network
-from primaite.simulator.network.hardware.base import NIC, Node
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.server import Server
-from primaite.simulator.network.networks import client_server_routed
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.host_node import NIC
+from primaite.simulator.network.hardware.nodes.host.server import Server


 def test_network(example_network):
@@ -14,22 +11,22 @@ def test_network(example_network):
    server_1: Server = network.get_node_by_hostname("server_1")
    server_2: Server = network.get_node_by_hostname("server_2")

-    assert client_1.ping(client_2.ethernet_port[1].ip_address)
-    assert client_2.ping(client_1.ethernet_port[1].ip_address)
+    assert client_1.ping(client_2.network_interface[1].ip_address)
+    assert client_2.ping(client_1.network_interface[1].ip_address)

-    assert server_1.ping(server_2.ethernet_port[1].ip_address)
-    assert server_2.ping(server_1.ethernet_port[1].ip_address)
+    assert server_1.ping(server_2.network_interface[1].ip_address)
+    assert server_2.ping(server_1.network_interface[1].ip_address)

-    assert client_1.ping(server_1.ethernet_port[1].ip_address)
-    assert client_2.ping(server_1.ethernet_port[1].ip_address)
-    assert client_1.ping(server_2.ethernet_port[1].ip_address)
-    assert client_2.ping(server_2.ethernet_port[1].ip_address)
+    assert client_1.ping(server_1.network_interface[1].ip_address)
+    assert client_2.ping(server_1.network_interface[1].ip_address)
+    assert client_1.ping(server_2.network_interface[1].ip_address)
+    assert client_2.ping(server_2.network_interface[1].ip_address)


 def test_adding_removing_nodes():
    """Check that we can create and add a node to a network."""
    net = Network()
-    n1 = Node(hostname="computer")
+    n1 = Computer(hostname="computer", ip_address="192.168.1.2", subnet_mask="255.255.255.0", start_up_duration=0)
    net.add_node(n1)
    assert n1.parent is net
    assert n1 in net
@@ -42,7 +39,7 @@ def test_adding_removing_nodes():
 def test_readding_node():
    """Check that warning is raised when readding a node."""
    net = Network()
-    n1 = Node(hostname="computer")
+    n1 = Computer(hostname="computer", ip_address="192.168.1.2", subnet_mask="255.255.255.0", start_up_duration=0)
    net.add_node(n1)
    net.add_node(n1)
    assert n1.parent is net
@@ -52,7 +49,7 @@ def test_readding_node():
 def test_removing_nonexistent_node():
    """Check that warning is raised when trying to remove a node that is not in the network."""
    net = Network()
-    n1 = Node(hostname="computer")
+    n1 = Computer(hostname="computer1", ip_address="192.168.1.1", subnet_mask="255.255.255.0", start_up_duration=0)
    net.remove_node(n1)
    assert n1.parent is None
    assert n1 not in net
@@ -61,17 +58,13 @@ def test_removing_nonexistent_node():
 def test_connecting_nodes():
    """Check that two nodes on the network can be connected."""
    net = Network()
-    n1 = Node(hostname="computer")
-    n1_nic = NIC(ip_address="120.30.0.1", gateway="192.168.0.1", subnet_mask="255.255.255.0")
-    n1.connect_nic(n1_nic)
-    n2 = Node(hostname="server")
-    n2_nic = NIC(ip_address="120.30.0.2", gateway="192.168.0.1", subnet_mask="255.255.255.0")
-    n2.connect_nic(n2_nic)
+    n1 = Computer(hostname="computer1", ip_address="192.168.1.1", subnet_mask="255.255.255.0", start_up_duration=0)
+    n2 = Computer(hostname="computer2", ip_address="192.168.1.2", subnet_mask="255.255.255.0", start_up_duration=0)

    net.add_node(n1)
    net.add_node(n2)

-    net.connect(n1.nics[n1_nic.uuid], n2.nics[n2_nic.uuid], bandwidth=30)
+    net.connect(n1.network_interface[1], n2.network_interface[1])

    assert len(net.links) == 1
    link = list(net.links.values())[0]
@@ -79,38 +72,29 @@ def test_connecting_nodes():
    assert link.parent is net


-def test_connecting_node_to_itself():
+def test_connecting_node_to_itself_fails():
    net = Network()
-    node = Node(hostname="computer")
-    nic1 = NIC(ip_address="120.30.0.1", gateway="192.168.0.1", subnet_mask="255.255.255.0")
-    node.connect_nic(nic1)
-    nic2 = NIC(ip_address="120.30.0.2", gateway="192.168.0.1", subnet_mask="255.255.255.0")
-    node.connect_nic(nic2)
+    node = Computer(hostname="node_b", ip_address="192.168.0.11", subnet_mask="255.255.255.0", start_up_duration=0)
+    node.power_on()
+    node.connect_nic(NIC(ip_address="10.0.0.12", subnet_mask="255.0.0.0"))

    net.add_node(node)

-    net.connect(node.nics[nic1.uuid], node.nics[nic2.uuid], bandwidth=30)
+    net.connect(node.network_interface[1], node.network_interface[2])

    assert node in net
-    assert nic1._connected_link is None
-    assert nic2._connected_link is None
+    assert node.network_interface[1]._connected_link is None
+    assert node.network_interface[2]._connected_link is None
    assert len(net.links) == 0


 def test_disconnecting_nodes():
    net = Network()

-    n1 = Node(hostname="computer")
-    n1_nic = NIC(ip_address="120.30.0.1", gateway="192.168.0.1", subnet_mask="255.255.255.0")
-    n1.connect_nic(n1_nic)
-    net.add_node(n1)
+    n1 = Computer(hostname="computer1", ip_address="192.168.1.1", subnet_mask="255.255.255.0", start_up_duration=0)
+    n2 = Computer(hostname="computer2", ip_address="192.168.1.2", subnet_mask="255.255.255.0", start_up_duration=0)

-    n2 = Node(hostname="server")
-    n2_nic = NIC(ip_address="120.30.0.2", gateway="192.168.0.1", subnet_mask="255.255.255.0")
-    n2.connect_nic(n2_nic)
-    net.add_node(n2)
-
-    net.connect(n1.nics[n1_nic.uuid], n2.nics[n2_nic.uuid], bandwidth=30)
+    net.connect(n1.network_interface[1], n2.network_interface[1])
    assert len(net.links) == 1

    link = list(net.links.values())[0]
--- a/tests/integration_tests/network/test_nic_link_connection.py
+++ b/tests/integration_tests/network/test_nic_link_connection.py
@@ -1,6 +1,7 @@
 import pytest

-from primaite.simulator.network.hardware.base import Link, NIC
+from primaite.simulator.network.hardware.base import Link
+from primaite.simulator.network.hardware.nodes.host.host_node import NIC


 def test_link_fails_with_same_nic():
--- a/tests/integration_tests/network/test_routing.py
+++ b/tests/integration_tests/network/test_routing.py
@@ -1,12 +1,10 @@
-from ipaddress import IPv4Address
 from typing import Tuple

 import pytest

 from primaite.simulator.network.container import Network
-from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.router import ACLAction, Router
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.network.router import ACLAction, Router
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.services.ntp.ntp_client import NTPClient
@@ -14,28 +12,37 @@ from primaite.simulator.system.services.ntp.ntp_server import NTPServer


@pytest.fixture(scope="function")
-def pc_a_pc_b_router_1() -> Tuple[Node, Node, Router]:
-    pc_a = Node(hostname="pc_a", default_gateway="192.168.0.1", operating_state=NodeOperatingState.ON)
-    nic_a = NIC(ip_address="192.168.0.10", subnet_mask="255.255.255.0")
-    pc_a.connect_nic(nic_a)
+def pc_a_pc_b_router_1() -> Tuple[Computer, Computer, Router]:
+    network = Network()
+    pc_a = Computer(
+        hostname="pc_a",
+        ip_address="192.168.0.10",
+        subnet_mask="255.255.255.0",
+        default_gateway="192.168.0.1",
+        start_up_duration=0,
+    )
+    pc_a.power_on()

-    pc_b = Node(hostname="pc_b", default_gateway="192.168.1.1", operating_state=NodeOperatingState.ON)
-    nic_b = NIC(ip_address="192.168.1.10", subnet_mask="255.255.255.0")
-    pc_b.connect_nic(nic_b)
+    pc_b = Computer(
+        hostname="pc_b",
+        ip_address="192.168.1.10",
+        subnet_mask="255.255.255.0",
+        default_gateway="192.168.1.1",
+        start_up_duration=0,
+    )
+    pc_b.power_on()

-    router_1 = Router(hostname="router_1", operating_state=NodeOperatingState.ON)
+    router_1 = Router(hostname="router_1", start_up_duration=0)
+    router_1.power_on()

    router_1.configure_port(1, "192.168.0.1", "255.255.255.0")
    router_1.configure_port(2, "192.168.1.1", "255.255.255.0")

-    Link(endpoint_a=nic_a, endpoint_b=router_1.ethernet_ports[1])
-    Link(endpoint_a=nic_b, endpoint_b=router_1.ethernet_ports[2])
+    network.connect(endpoint_a=pc_a.network_interface[1], endpoint_b=router_1.network_interface[1])
+    network.connect(endpoint_a=pc_b.network_interface[1], endpoint_b=router_1.network_interface[2])
    router_1.enable_port(1)
    router_1.enable_port(2)

-    router_1.acl.add_rule(action=ACLAction.PERMIT, src_port=Port.ARP, dst_port=Port.ARP, position=22)
-
-    router_1.acl.add_rule(action=ACLAction.PERMIT, protocol=IPProtocol.ICMP, position=23)
    return pc_a, pc_b, router_1


@@ -61,7 +68,7 @@ def multi_hop_network() -> Network:

    # Configure the connection between PC A and Router 1 port 2
    router_1.configure_port(2, "192.168.0.1", "255.255.255.0")
-    network.connect(pc_a.ethernet_port[1], router_1.ethernet_ports[2])
+    network.connect(pc_a.network_interface[1], router_1.network_interface[2])
    router_1.enable_port(2)

    # Configure Router 1 ACLs
@@ -86,17 +93,15 @@ def multi_hop_network() -> Network:

    # Configure the connection between PC B and Router 2 port 2
    router_2.configure_port(2, "192.168.2.1", "255.255.255.0")
-    network.connect(pc_b.ethernet_port[1], router_2.ethernet_ports[2])
+    network.connect(pc_b.network_interface[1], router_2.network_interface[2])
    router_2.enable_port(2)

    # Configure Router 2 ACLs
-    router_2.acl.add_rule(action=ACLAction.PERMIT, src_port=Port.ARP, dst_port=Port.ARP, position=22)
-    router_2.acl.add_rule(action=ACLAction.PERMIT, protocol=IPProtocol.ICMP, position=23)

    # Configure the connection between Router 1 port 1 and Router 2 port 1
    router_2.configure_port(1, "192.168.1.2", "255.255.255.252")
    router_1.configure_port(1, "192.168.1.1", "255.255.255.252")
-    network.connect(router_1.ethernet_ports[1], router_2.ethernet_ports[1])
+    network.connect(router_1.network_interface[1], router_2.network_interface[1])
    router_1.enable_port(1)
    router_2.enable_port(1)
    return network
@@ -117,14 +122,14 @@ def test_ping_other_router_port(pc_a_pc_b_router_1):
 def test_host_on_other_subnet(pc_a_pc_b_router_1):
    pc_a, pc_b, router_1 = pc_a_pc_b_router_1

-    assert pc_a.ping("192.168.1.10")
+    assert pc_a.ping(pc_b.network_interface[1].ip_address)


 def test_no_route_no_ping(multi_hop_network):
    pc_a = multi_hop_network.get_node_by_hostname("pc_a")
    pc_b = multi_hop_network.get_node_by_hostname("pc_b")

-    assert not pc_a.ping(pc_b.ethernet_port[1].ip_address)
+    assert not pc_a.ping(pc_b.network_interface[1].ip_address)


 def test_with_routes_can_ping(multi_hop_network):
@@ -144,7 +149,7 @@ def test_with_routes_can_ping(multi_hop_network):
        address="192.168.0.2", subnet_mask="255.255.255.0", next_hop_ip_address="192.168.1.1"
    )

-    assert pc_a.ping(pc_b.ethernet_port[1].ip_address)
+    assert pc_a.ping(pc_b.network_interface[1].ip_address)


 def test_routing_services(multi_hop_network):
@@ -159,7 +164,7 @@ def test_routing_services(multi_hop_network):
    pc_b.software_manager.install(NTPServer)
    pc_b.software_manager.software["NTPServer"].start()

-    ntp_client.configure(ntp_server_ip_address=pc_b.ethernet_port[1].ip_address)
+    ntp_client.configure(ntp_server_ip_address=pc_b.network_interface[1].ip_address)

    router_1: Router = multi_hop_network.get_node_by_hostname("router_1")  # noqa
    router_2: Router = multi_hop_network.get_node_by_hostname("router_2")  # noqa
--- a/tests/integration_tests/network/test_switched_network.py
+++ b/tests/integration_tests/network/test_switched_network.py
@@ -1,30 +1,5 @@
-from primaite.simulator.network.hardware.base import Link, NodeOperatingState
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.server import Server
-from primaite.simulator.network.hardware.nodes.switch import Switch
-
-
-def test_switched_network():
+def test_switched_network(client_switch_server):
    """Tests a node can ping another node via the switch."""
-    client_1 = Computer(
-        hostname="client_1",
-        ip_address="192.168.1.10",
-        subnet_mask="255.255.255.0",
-        default_gateway="192.168.1.0",
-        operating_state=NodeOperatingState.ON,
-    )
+    computer, switch, server = client_switch_server

-    server_1 = Server(
-        hostname=" server_1",
-        ip_address="192.168.1.11",
-        subnet_mask="255.255.255.0",
-        default_gateway="192.168.1.11",
-        operating_state=NodeOperatingState.ON,
-    )
-
-    switch_1 = Switch(hostname="switch_1", num_ports=6, operating_state=NodeOperatingState.ON)
-
-    Link(endpoint_a=client_1.ethernet_port[1], endpoint_b=switch_1.switch_ports[1])
-    Link(endpoint_a=server_1.ethernet_port[1], endpoint_b=switch_1.switch_ports[2])
-
-    assert client_1.ping("192.168.1.11")
+    assert computer.ping(server.network_interface[1].ip_address)
--- a/tests/integration_tests/system/red_applications/test_dos_bot_and_server.py
+++ b/tests/integration_tests/system/red_applications/test_dos_bot_and_server.py
@@ -4,9 +4,9 @@ from typing import Tuple
 import pytest

 from primaite.simulator.network.container import Network
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.router import ACLAction, Router
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
+from primaite.simulator.network.hardware.nodes.network.router import ACLAction, Router
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.applications.application import ApplicationOperatingState
 from primaite.simulator.system.applications.database_client import DatabaseClient
@@ -24,7 +24,7 @@ def dos_bot_and_db_server(client_server) -> Tuple[DoSBot, Computer, DatabaseServ

    dos_bot: DoSBot = computer.software_manager.software.get("DoSBot")
    dos_bot.configure(
-        target_ip_address=IPv4Address(server.nics.get(next(iter(server.nics))).ip_address),
+        target_ip_address=IPv4Address(server.network_interface[1].ip_address),
        target_port=Port.POSTGRES_SERVER,
    )

@@ -54,7 +54,7 @@ def dos_bot_db_server_green_client(example_network) -> Network:

    dos_bot: DoSBot = client_1.software_manager.software.get("DoSBot")
    dos_bot.configure(
-        target_ip_address=IPv4Address(server.nics.get(next(iter(server.nics))).ip_address),
+        target_ip_address=IPv4Address(server.network_interface[1].ip_address),
        target_port=Port.POSTGRES_SERVER,
    )

--- a/tests/integration_tests/system/test_application_on_node.py
+++ b/tests/integration_tests/system/test_application_on_node.py
@@ -3,7 +3,7 @@ from typing import Tuple
 import pytest

 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.system.applications.application import Application, ApplicationOperatingState


@@ -14,8 +14,10 @@ def populated_node(application_class) -> Tuple[Application, Computer]:
        ip_address="192.168.1.2",
        subnet_mask="255.255.255.0",
        default_gateway="192.168.1.1",
-        operating_state=NodeOperatingState.ON,
+        start_up_duration=0,
+        shut_down_duration=0,
    )
+    computer.power_on()
    computer.software_manager.install(application_class)

    app = computer.software_manager.software.get("TestApplication")
@@ -31,7 +33,8 @@ def test_application_on_offline_node(application_class):
        ip_address="192.168.1.2",
        subnet_mask="255.255.255.0",
        default_gateway="192.168.1.1",
-        operating_state=NodeOperatingState.ON,
+        start_up_duration=0,
+        shut_down_duration=0,
    )
    computer.software_manager.install(application_class)

@@ -39,9 +42,6 @@ def test_application_on_offline_node(application_class):

    computer.power_off()

-    for i in range(computer.shut_down_duration + 1):
-        computer.apply_timestep(timestep=i)
-
    assert computer.operating_state is NodeOperatingState.OFF
    assert app.operating_state is ApplicationOperatingState.CLOSED

@@ -58,9 +58,6 @@ def test_server_turns_off_application(populated_node):

    computer.power_off()

-    for i in range(computer.shut_down_duration + 1):
-        computer.apply_timestep(timestep=i)
-
    assert computer.operating_state is NodeOperatingState.OFF
    assert app.operating_state is ApplicationOperatingState.CLOSED

@@ -74,9 +71,6 @@ def test_application_cannot_be_turned_on_when_computer_is_off(populated_node):

    computer.power_off()

-    for i in range(computer.shut_down_duration + 1):
-        computer.apply_timestep(timestep=i)
-
    assert computer.operating_state is NodeOperatingState.OFF
    assert app.operating_state is ApplicationOperatingState.CLOSED

@@ -95,28 +89,20 @@ def test_computer_runs_applications(populated_node):

    computer.power_off()

-    for i in range(computer.shut_down_duration + 1):
-        computer.apply_timestep(timestep=i)
-
    assert computer.operating_state is NodeOperatingState.OFF
    assert app.operating_state is ApplicationOperatingState.CLOSED

    computer.power_on()

-    for i in range(computer.start_up_duration + 1):
-        computer.apply_timestep(timestep=i)
-
    assert computer.operating_state is NodeOperatingState.ON
    assert app.operating_state is ApplicationOperatingState.RUNNING

    computer.power_off()
-    for i in range(computer.start_up_duration + 1):
-        computer.apply_timestep(timestep=i)
+
    assert computer.operating_state is NodeOperatingState.OFF
    assert app.operating_state is ApplicationOperatingState.CLOSED

    computer.power_on()
-    for i in range(computer.start_up_duration + 1):
-        computer.apply_timestep(timestep=i)
+
    assert computer.operating_state is NodeOperatingState.ON
    assert app.operating_state is ApplicationOperatingState.RUNNING
--- a/tests/integration_tests/system/test_database_on_node.py
+++ b/tests/integration_tests/system/test_database_on_node.py
@@ -3,8 +3,10 @@ from typing import Tuple

 import pytest

-from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.container import Network
+from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.system.applications.database_client import DatabaseClient
 from primaite.simulator.system.services.database.database_service import DatabaseService
 from primaite.simulator.system.services.ftp.ftp_server import FTPServer
@@ -12,17 +14,15 @@ from primaite.simulator.system.services.service import ServiceOperatingState


@pytest.fixture(scope="function")
-def peer_to_peer() -> Tuple[Node, Node]:
-    node_a = Node(hostname="node_a", operating_state=NodeOperatingState.ON)
-    nic_a = NIC(ip_address="192.168.0.10", subnet_mask="255.255.255.0", operating_state=NodeOperatingState.ON)
-    node_a.connect_nic(nic_a)
+def peer_to_peer() -> Tuple[Computer, Computer]:
+    network = Network()
+    node_a = Computer(hostname="node_a", ip_address="192.168.0.10", subnet_mask="255.255.255.0", start_up_duration=0)
+    node_a.power_on()
    node_a.software_manager.get_open_ports()

-    node_b = Node(hostname="node_b", operating_state=NodeOperatingState.ON)
-    nic_b = NIC(ip_address="192.168.0.11", subnet_mask="255.255.255.0")
-    node_b.connect_nic(nic_b)
-
-    Link(endpoint_a=nic_a, endpoint_b=nic_b)
+    node_b = Computer(hostname="node_b", ip_address="192.168.0.11", subnet_mask="255.255.255.0", start_up_duration=0)
+    node_b.power_on()
+    network.connect(node_a.network_interface[1], node_b.network_interface[1])

    assert node_a.ping("192.168.0.11")

@@ -37,26 +37,11 @@ def peer_to_peer() -> Tuple[Node, Node]:


@pytest.fixture(scope="function")
-def peer_to_peer_secure_db() -> Tuple[Node, Node]:
-    node_a = Node(hostname="node_a", operating_state=NodeOperatingState.ON)
-    nic_a = NIC(ip_address="192.168.0.10", subnet_mask="255.255.255.0", operating_state=NodeOperatingState.ON)
-    node_a.connect_nic(nic_a)
-    node_a.software_manager.get_open_ports()
+def peer_to_peer_secure_db(peer_to_peer) -> Tuple[Computer, Computer]:
+    node_a, node_b = peer_to_peer

-    node_b = Node(hostname="node_b", operating_state=NodeOperatingState.ON)
-    nic_b = NIC(ip_address="192.168.0.11", subnet_mask="255.255.255.0")
-    node_b.connect_nic(nic_b)
-
-    Link(endpoint_a=nic_a, endpoint_b=nic_b)
-
-    assert node_a.ping("192.168.0.11")
-
-    node_a.software_manager.install(DatabaseClient)
-    node_a.software_manager.software["DatabaseClient"].configure(server_ip_address=IPv4Address("192.168.0.11"))
-    node_a.software_manager.software["DatabaseClient"].run()
-
-    node_b.software_manager.install(DatabaseService)
    database_service: DatabaseService = node_b.software_manager.software["DatabaseService"]  # noqa
+    database_service.stop()
    database_service.password = "12345"
    database_service.start()
    return node_a, node_b
--- a/tests/integration_tests/system/test_dns_client_server.py
+++ b/tests/integration_tests/system/test_dns_client_server.py
@@ -4,8 +4,8 @@ from typing import Tuple
 import pytest

 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.system.services.dns.dns_client import DNSClient
 from primaite.simulator.system.services.dns.dns_server import DNSServer
 from primaite.simulator.system.services.service import ServiceOperatingState
@@ -20,7 +20,7 @@ def dns_client_and_dns_server(client_server) -> Tuple[DNSClient, Computer, DNSSe
    dns_client: DNSClient = computer.software_manager.software.get("DNSClient")
    dns_client.start()
    # set server as DNS Server
-    dns_client.dns_server = IPv4Address(server.nics.get(next(iter(server.nics))).ip_address)
+    dns_client.dns_server = IPv4Address(server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address)

    # Install DNS Server on server
    server.software_manager.install(DNSServer)
@@ -28,7 +28,8 @@ def dns_client_and_dns_server(client_server) -> Tuple[DNSClient, Computer, DNSSe
    dns_server.start()
    # register arcd.com as a domain
    dns_server.dns_register(
-        domain_name="arcd.com", domain_ip_address=IPv4Address(server.nics.get(next(iter(server.nics))).ip_address)
+        domain_name="arcd.com",
+        domain_ip_address=IPv4Address(server.network_interface[1].ip_address),
    )

    return dns_client, computer, dns_server, server
--- a/tests/integration_tests/system/test_ftp_client_server.py
+++ b/tests/integration_tests/system/test_ftp_client_server.py
@@ -1,10 +1,9 @@
-from ipaddress import IPv4Address
 from typing import Tuple

 import pytest

-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.system.services.ftp.ftp_client import FTPClient
 from primaite.simulator.system.services.ftp.ftp_server import FTPServer
 from primaite.simulator.system.services.service import ServiceOperatingState
@@ -44,7 +43,7 @@ def test_ftp_client_store_file_in_server(ftp_client_and_ftp_server):
        src_file_name="test_file.txt",
        dest_folder_name="client_1_backup",
        dest_file_name="test_file.txt",
-        dest_ip_address=server.nics.get(next(iter(server.nics))).ip_address,
+        dest_ip_address=server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address,
    )

    assert ftp_server.file_system.get_file(folder_name="client_1_backup", file_name="test_file.txt")
@@ -67,7 +66,7 @@ def test_ftp_client_retrieve_file_from_server(ftp_client_and_ftp_server):
        src_file_name="test_file.txt",
        dest_folder_name="downloads",
        dest_file_name="test_file.txt",
-        dest_ip_address=server.nics.get(next(iter(server.nics))).ip_address,
+        dest_ip_address=server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address,
    )

    # client should have retrieved the file
@@ -98,7 +97,7 @@ def test_ftp_client_tries_to_connect_to_offline_server(ftp_client_and_ftp_server
            src_file_name="test_file.txt",
            dest_folder_name="downloads",
            dest_file_name="test_file.txt",
-            dest_ip_address=server.nics.get(next(iter(server.nics))).ip_address,
+            dest_ip_address=server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address,
        )
        is False
    )
--- a/tests/integration_tests/system/test_ntp_client_server.py
+++ b/tests/integration_tests/system/test_ntp_client_server.py
@@ -4,10 +4,8 @@ from typing import Tuple

 import pytest

-from primaite.simulator.network.container import Network
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.server import Server
-from primaite.simulator.network.protocols.ntp import NTPPacket
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.system.services.ntp.ntp_client import NTPClient
 from primaite.simulator.system.services.ntp.ntp_server import NTPServer
 from primaite.simulator.system.services.service import ServiceOperatingState
@@ -49,11 +47,11 @@ def test_ntp_client_server(create_ntp_network):

    assert ntp_server.operating_state == ServiceOperatingState.RUNNING
    assert ntp_client.operating_state == ServiceOperatingState.RUNNING
-    ntp_client.configure(ntp_server_ip_address=IPv4Address("192.168.0.2"))
+    ntp_client.configure(ntp_server_ip_address=IPv4Address("192.168.1.3"))

-    assert ntp_client.time is None
+    assert not ntp_client.time
    ntp_client.request_time()
-    assert ntp_client.time is not None
+    assert ntp_client.time
    first_time = ntp_client.time
    sleep(0.1)
    ntp_client.apply_timestep(1)  # Check time advances
@@ -70,7 +68,7 @@ def test_ntp_server_failure(create_ntp_network):

    assert ntp_client.operating_state == ServiceOperatingState.RUNNING
    assert ntp_client.operating_state == ServiceOperatingState.RUNNING
-    ntp_client.configure(ntp_server_ip_address=IPv4Address("192.168.0.2"))
+    ntp_client.configure(ntp_server_ip_address=IPv4Address("192.168.1.3"))

    # Turn off ntp server.
    ntp_server.stop()
--- a/tests/integration_tests/system/test_service_on_node.py
+++ b/tests/integration_tests/system/test_service_on_node.py
@@ -3,8 +3,8 @@ from typing import Tuple
 import pytest

 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.system.services.service import Service, ServiceOperatingState


@@ -13,8 +13,13 @@ def populated_node(
    service_class,
 ) -> Tuple[Server, Service]:
    server = Server(
-        hostname="server", ip_address="192.168.0.1", subnet_mask="255.255.255.0", operating_state=NodeOperatingState.ON
+        hostname="server",
+        ip_address="192.168.0.1",
+        subnet_mask="255.255.255.0",
+        start_up_duration=0,
+        shut_down_duration=0,
    )
+    server.power_on()
    server.software_manager.install(service_class)

    service = server.software_manager.software.get("TestService")
@@ -30,17 +35,16 @@ def test_service_on_offline_node(service_class):
        ip_address="192.168.1.2",
        subnet_mask="255.255.255.0",
        default_gateway="192.168.1.1",
-        operating_state=NodeOperatingState.ON,
+        start_up_duration=0,
+        shut_down_duration=0,
    )
+    computer.power_on()
    computer.software_manager.install(service_class)

    service: Service = computer.software_manager.software.get("TestService")

    computer.power_off()

-    for i in range(computer.shut_down_duration + 1):
-        computer.apply_timestep(timestep=i)
-
    assert computer.operating_state is NodeOperatingState.OFF
    assert service.operating_state is ServiceOperatingState.STOPPED

@@ -66,9 +70,6 @@ def test_server_turns_off_service(populated_node):

    server.power_off()

-    for i in range(server.shut_down_duration + 1):
-        server.apply_timestep(timestep=i)
-
    assert server.operating_state is NodeOperatingState.OFF
    assert service.operating_state is ServiceOperatingState.STOPPED

@@ -82,9 +83,6 @@ def test_service_cannot_be_turned_on_when_server_is_off(populated_node):

    server.power_off()

-    for i in range(server.shut_down_duration + 1):
-        server.apply_timestep(timestep=i)
-
    assert server.operating_state is NodeOperatingState.OFF
    assert service.operating_state is ServiceOperatingState.STOPPED

@@ -103,28 +101,20 @@ def test_server_turns_on_service(populated_node):

    server.power_off()

-    for i in range(server.shut_down_duration + 1):
-        server.apply_timestep(timestep=i)
-
    assert server.operating_state is NodeOperatingState.OFF
    assert service.operating_state is ServiceOperatingState.STOPPED

    server.power_on()

-    for i in range(server.start_up_duration + 1):
-        server.apply_timestep(timestep=i)
-
    assert server.operating_state is NodeOperatingState.ON
    assert service.operating_state is ServiceOperatingState.RUNNING

    server.power_off()
-    for i in range(server.start_up_duration + 1):
-        server.apply_timestep(timestep=i)
+
    assert server.operating_state is NodeOperatingState.OFF
    assert service.operating_state is ServiceOperatingState.STOPPED

    server.power_on()
-    for i in range(server.start_up_duration + 1):
-        server.apply_timestep(timestep=i)
+
    assert server.operating_state is NodeOperatingState.ON
    assert service.operating_state is ServiceOperatingState.RUNNING
--- a/tests/integration_tests/system/test_web_client_server.py
+++ b/tests/integration_tests/system/test_web_client_server.py
@@ -3,8 +3,8 @@ from typing import Tuple
 import pytest

 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.network.protocols.http import HttpStatusCode
 from primaite.simulator.system.applications.application import ApplicationOperatingState
 from primaite.simulator.system.applications.web_browser import WebBrowser
@@ -26,7 +26,7 @@ def web_client_and_web_server(client_server) -> Tuple[WebBrowser, Computer, WebS
    computer.software_manager.install(DNSClient)
    dns_client: DNSClient = computer.software_manager.software.get("DNSClient")
    # set dns server
-    dns_client.dns_server = server.nics[next(iter(server.nics))].ip_address
+    dns_client.dns_server = server.network_interfaces[next(iter(server.network_interfaces))].ip_address

    # Install Web Server service on server
    server.software_manager.install(WebServer)
@@ -37,7 +37,10 @@ def web_client_and_web_server(client_server) -> Tuple[WebBrowser, Computer, WebS
    server.software_manager.install(DNSServer)
    dns_server: DNSServer = server.software_manager.software.get("DNSServer")
    # register arcd.com to DNS
-    dns_server.dns_register(domain_name="arcd.com", domain_ip_address=server.nics[next(iter(server.nics))].ip_address)
+    dns_server.dns_register(
+        domain_name="arcd.com",
+        domain_ip_address=server.network_interfaces[next(iter(server.network_interfaces))].ip_address,
+    )

    return web_browser, computer, web_server_service, server

@@ -46,7 +49,7 @@ def test_web_page_get_users_page_request_with_domain_name(web_client_and_web_ser
    """Test to see if the client can handle requests with domain names"""
    web_browser_app, computer, web_server_service, server = web_client_and_web_server

-    web_server_ip = server.nics.get(next(iter(server.nics))).ip_address
+    web_server_ip = server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address
    web_browser_app.target_url = f"http://arcd.com/"
    assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING

@@ -61,7 +64,7 @@ def test_web_page_get_users_page_request_with_ip_address(web_client_and_web_serv
    """Test to see if the client can handle requests that use ip_address."""
    web_browser_app, computer, web_server_service, server = web_client_and_web_server

-    web_server_ip = server.nics.get(next(iter(server.nics))).ip_address
+    web_server_ip = server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address
    web_browser_app.target_url = f"http://{web_server_ip}/"
    assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING

@@ -76,7 +79,7 @@ def test_web_page_request_from_shut_down_server(web_client_and_web_server):
    """Test to see that the web server does not respond when the server is off."""
    web_browser_app, computer, web_server_service, server = web_client_and_web_server

-    web_server_ip = server.nics.get(next(iter(server.nics))).ip_address
+    web_server_ip = server.network_interfaces.get(next(iter(server.network_interfaces))).ip_address
    web_browser_app.target_url = f"http://arcd.com/"
    assert web_browser_app.operating_state == ApplicationOperatingState.RUNNING

--- a/tests/integration_tests/system/test_web_client_server_and_database.py
+++ b/tests/integration_tests/system/test_web_client_server_and_database.py
@@ -5,10 +5,9 @@ import pytest

 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.base import Link
-from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.network.hardware.nodes.router import ACLAction, Router
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
+from primaite.simulator.network.hardware.nodes.network.router import ACLAction, Router
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.applications.database_client import DatabaseClient
 from primaite.simulator.system.applications.web_browser import WebBrowser
@@ -45,9 +44,9 @@ def web_client_web_server_database(example_network) -> Tuple[Network, Computer,
    db_server = example_network.get_node_by_hostname("server_2")

    # Get the NICs
-    computer_nic = computer.nics[next(iter(computer.nics))]
-    server_nic = web_server.nics[next(iter(web_server.nics))]
-    db_server_nic = db_server.nics[next(iter(db_server.nics))]
+    computer_nic = computer.network_interfaces[next(iter(computer.network_interfaces))]
+    server_nic = web_server.network_interfaces[next(iter(web_server.network_interfaces))]
+    db_server_nic = db_server.network_interfaces[next(iter(db_server.network_interfaces))]

    # Connect Computer and Server
    link_computer_server = Link(endpoint_a=computer_nic, endpoint_b=server_nic)
@@ -75,7 +74,7 @@ def web_client_web_server_database(example_network) -> Tuple[Network, Computer,
    computer.software_manager.install(DNSClient)
    dns_client: DNSClient = computer.software_manager.software.get("DNSClient")
    # set dns server
-    dns_client.dns_server = web_server.nics[next(iter(web_server.nics))].ip_address
+    dns_client.dns_server = web_server.network_interfaces[next(iter(web_server.network_interfaces))].ip_address

    # Install Web Server service on web server
    web_server.software_manager.install(WebServer)
@@ -87,7 +86,8 @@ def web_client_web_server_database(example_network) -> Tuple[Network, Computer,
    dns_server: DNSServer = web_server.software_manager.software.get("DNSServer")
    # register arcd.com to DNS
    dns_server.dns_register(
-        domain_name="arcd.com", domain_ip_address=web_server.nics[next(iter(web_server.nics))].ip_address
+        domain_name="arcd.com",
+        domain_ip_address=web_server.network_interfaces[next(iter(web_server.network_interfaces))].ip_address,
    )

    # Install DatabaseClient service on web server