#2248 - Big refactor of base with all Network Interface subclasses created to allow for proper management of ports on devices as it was starting to get messy with the Router. Some routing tests still need fixing as ARP doesn't seem to be working properly

tests/assets/configs/bad_primaite_session.yaml

@@ -633,7 +633,7 @@ simulation:
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
       dns_server: 192.168.1.10
-      nics:
+      network_interfaces:
         2: # unfortunately this number is currently meaningless, they're just added in order and take up the next available slot
           ip_address: 192.168.10.110
           subnet_mask: 255.255.255.0

tests/assets/configs/eval_only_primaite_session.yaml

@@ -637,7 +637,7 @@ simulation:
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
       dns_server: 192.168.1.10
-      nics:
+      network_interfaces:
         2: # unfortunately this number is currently meaningless, they're just added in order and take up the next available slot
           ip_address: 192.168.10.110
           subnet_mask: 255.255.255.0

tests/assets/configs/multi_agent_session.yaml

@@ -1092,7 +1092,7 @@ simulation:
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
       dns_server: 192.168.1.10
-      nics:
+      network_interfaces:
         2: # unfortunately this number is currently meaningless, they're just added in order and take up the next available slot
           ip_address: 192.168.10.110
           subnet_mask: 255.255.255.0

tests/assets/configs/test_primaite_session.yaml

@@ -642,7 +642,7 @@ simulation:
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
       dns_server: 192.168.1.10
-      nics:
+      network_interfaces:
         2: # unfortunately this number is currently meaningless, they're just added in order and take up the next available slot
           ip_address: 192.168.10.110
           subnet_mask: 255.255.255.0

tests/assets/configs/train_only_primaite_session.yaml

@@ -643,7 +643,7 @@ simulation:
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
       dns_server: 192.168.1.10
-      nics:
+      network_interfaces:
         2: # unfortunately this number is currently meaningless, they're just added in order and take up the next available slot
           ip_address: 192.168.10.110
           subnet_mask: 255.255.255.0

tests/conftest.py

@@ -6,17 +6,15 @@ import pytest
 import yaml
 
 from primaite import getLogger
-from primaite.game.game import PrimaiteGame
 from primaite.session.session import PrimaiteSession
 
 # from primaite.environment.primaite_env import Primaite
 # from primaite.primaite_session import PrimaiteSession
 from primaite.simulator.network.container import Network
-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.network.router import ACLAction, Router
+from primaite.simulator.network.hardware.nodes.host.server import Server
+from primaite.simulator.network.hardware.nodes.network.switch import Switch
 from primaite.simulator.network.networks import arcd_uc2_network
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
@@ -34,7 +32,7 @@ from primaite import PRIMAITE_PATHS
 
 # PrimAITE v3 stuff
 from primaite.simulator.file_system.file_system import FileSystem
-from primaite.simulator.network.hardware.base import Link, Node
+from primaite.simulator.network.hardware.base import Node
 
 
 class TestService(Service):
@@ -157,7 +155,7 @@ def client_server() -> Tuple[Computer, Server]:
     server.power_on()
 
     # Connect Computer and Server
-    network.connect(computer.ethernet_port[1], server.ethernet_port[1])
+    network.connect(computer.network_interface[1], server.network_interface[1])
 
     # Should be linked
     assert next(iter(network.links.values())).is_up
@@ -192,8 +190,8 @@ def client_switch_server() -> Tuple[Computer, Switch, Server]:
     switch = Switch(hostname="switch", start_up_duration=0)
     switch.power_on()
 
-    network.connect(endpoint_a=computer.ethernet_port[1], endpoint_b=switch.switch_ports[1])
-    network.connect(endpoint_a=server.ethernet_port[1], endpoint_b=switch.switch_ports[2])
+    network.connect(endpoint_a=computer.network_interface[1], endpoint_b=switch.switch_ports[1])
+    network.connect(endpoint_a=server.network_interface[1], endpoint_b=switch.switch_ports[2])
 
     assert all(link.is_up for link in network.links.values())
 
@@ -219,18 +217,33 @@ def example_network() -> Network:
     network = Network()
 
     # Router 1
-    router_1 = Router(hostname="router_1", num_ports=5, operating_state=NodeOperatingState.ON)
+    router_1 = Router(
+        hostname="router_1",
+        start_up_duration=0
+    )
+    router_1.power_on()
     router_1.configure_port(port=1, ip_address="192.168.1.1", subnet_mask="255.255.255.0")
     router_1.configure_port(port=2, ip_address="192.168.10.1", subnet_mask="255.255.255.0")
 
     # Switch 1
-    switch_1 = Switch(hostname="switch_1", num_ports=8, operating_state=NodeOperatingState.ON)
-    network.connect(endpoint_a=router_1.ethernet_ports[1], endpoint_b=switch_1.switch_ports[8])
+    switch_1 = Switch(
+        hostname="switch_1",
+        num_ports=8,
+        start_up_duration=0
+    )
+    switch_1.power_on()
+
+    network.connect(endpoint_a=router_1.network_interface[1], endpoint_b=switch_1.switch_ports[8])
     router_1.enable_port(1)
 
     # Switch 2
-    switch_2 = Switch(hostname="switch_2", num_ports=8, operating_state=NodeOperatingState.ON)
-    network.connect(endpoint_a=router_1.ethernet_ports[2], endpoint_b=switch_2.switch_ports[8])
+    switch_2 = Switch(
+        hostname="switch_2",
+        num_ports=8,
+        start_up_duration=0
+    )
+    switch_2.power_on()
+    network.connect(endpoint_a=router_1.network_interface[2], endpoint_b=switch_2.switch_ports[8])
     router_1.enable_port(2)
 
     # Client 1
@@ -239,9 +252,10 @@ def example_network() -> Network:
         ip_address="192.168.10.21",
         subnet_mask="255.255.255.0",
         default_gateway="192.168.10.1",
-        operating_state=NodeOperatingState.ON,
+        start_up_duration=0
     )
-    network.connect(endpoint_b=client_1.ethernet_port[1], endpoint_a=switch_2.switch_ports[1])
+    client_1.power_on()
+    network.connect(endpoint_b=client_1.network_interface[1], endpoint_a=switch_2.switch_ports[1])
 
     # Client 2
     client_2 = Computer(
@@ -249,32 +263,37 @@ def example_network() -> Network:
         ip_address="192.168.10.22",
         subnet_mask="255.255.255.0",
         default_gateway="192.168.10.1",
-        operating_state=NodeOperatingState.ON,
+        start_up_duration=0
     )
-    network.connect(endpoint_b=client_2.ethernet_port[1], endpoint_a=switch_2.switch_ports[2])
+    client_2.power_on()
+    network.connect(endpoint_b=client_2.network_interface[1], endpoint_a=switch_2.switch_ports[2])
 
-    # Domain Controller
+    # Server 1
     server_1 = Server(
         hostname="server_1",
         ip_address="192.168.1.10",
         subnet_mask="255.255.255.0",
         default_gateway="192.168.1.1",
-        operating_state=NodeOperatingState.ON,
+        start_up_duration=0
     )
+    server_1.power_on()
+    network.connect(endpoint_b=server_1.network_interface[1], endpoint_a=switch_1.switch_ports[1])
 
-    network.connect(endpoint_b=server_1.ethernet_port[1], endpoint_a=switch_1.switch_ports[1])
-
-    # Database Server
+    # DServer 2
     server_2 = Server(
         hostname="server_2",
         ip_address="192.168.1.14",
         subnet_mask="255.255.255.0",
         default_gateway="192.168.1.1",
-        operating_state=NodeOperatingState.ON,
+        start_up_duration=0
     )
-    network.connect(endpoint_b=server_2.ethernet_port[1], endpoint_a=switch_1.switch_ports[2])
+    server_2.power_on()
+    network.connect(endpoint_b=server_2.network_interface[1], endpoint_a=switch_1.switch_ports[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)
 
+    assert all(link.is_up for link in network.links.values())
+
+
     return network

tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py

@@ -1,5 +1,5 @@
-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.applications.database_client import DatabaseClient
 from primaite.simulator.system.applications.red_applications.data_manipulation_bot import DataManipulationBot
 from primaite.simulator.system.services.database.database_service import DatabaseService

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.switch_ports[1])
+    sim.network.connect(pc2.network_interface[1], s1.switch_ports[2])
+    sim.network.connect(s1.switch_ports[3], srv.network_interface[1])
 
     # call this method to make sure no errors occur.
     sim._request_manager.get_request_types_recursively()

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
 
 

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
@@ -111,9 +111,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.switch_ports[1])
+    network.connect(endpoint_a=client_2.network_interface[1], endpoint_b=switch_1.switch_ports[2])
+    network.connect(endpoint_a=server_1.network_interface[1], endpoint_b=switch_1.switch_ports[3])
 
     return network
 

tests/integration_tests/network/test_frame_transmission.py

@@ -1,7 +1,7 @@
 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
 
 
 
@@ -30,8 +30,8 @@ def test_node_to_node_ping():
     switch_1 = Switch(hostname="switch_1", 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=server_1.ethernet_port[1], endpoint_b=switch_1.switch_ports[2])
+    network.connect(endpoint_a=client_1.network_interface[1], endpoint_b=switch_1.switch_ports[1])
+    network.connect(endpoint_a=server_1.network_interface[1], endpoint_b=switch_1.switch_ports[2])
 
     assert client_1.ping("192.168.1.11")
 

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.base import Node
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from primaite.simulator.network.hardware.nodes.host.server import Server
 
 
 def test_network(example_network):
@@ -14,16 +11,16 @@ 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():
@@ -71,7 +68,7 @@ def test_connecting_nodes():
     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_interfaces[n1_nic.uuid], n2.network_interfaces[n2_nic.uuid], bandwidth=30)
 
     assert len(net.links) == 1
     link = list(net.links.values())[0]
@@ -89,7 +86,7 @@ def test_connecting_node_to_itself():
 
     net.add_node(node)
 
-    net.connect(node.nics[nic1.uuid], node.nics[nic2.uuid], bandwidth=30)
+    net.connect(node.network_interfaces[nic1.uuid], node.network_interfaces[nic2.uuid], bandwidth=30)
 
     assert node in net
     assert nic1._connected_link is None
@@ -110,7 +107,7 @@ def test_disconnecting_nodes():
     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_interfaces[n1_nic.uuid], n2.network_interfaces[n2_nic.uuid], bandwidth=30)
     assert len(net.links) == 1
 
     link = list(net.links.values())[0]

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

tests/integration_tests/network/test_switched_network.py

@@ -1,12 +1,5 @@
-from primaite.simulator.network.container import Network
-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(client_switch_server):
     """Tests a node can ping another node via the switch."""
     computer, switch, server = client_switch_server
 
-    assert computer.ping(server.ethernet_port[1].ip_address)
+    assert computer.ping(server.network_interface[1].ip_address)

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.network.router import ACLAction, Router
+from primaite.simulator.network.hardware.nodes.host.server import Server
 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_interfaces.get(next(iter(server.network_interfaces))).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_interfaces.get(next(iter(server.network_interfaces))).ip_address),
         target_port=Port.POSTGRES_SERVER,
     )
 

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
 
 

tests/integration_tests/system/test_database_on_node.py

@@ -4,7 +4,7 @@ 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.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

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,7 @@ 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_interfaces.get(next(iter(server.network_interfaces))).ip_address)
     )
 
     return dns_client, computer, dns_server, server

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
     )

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

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
 
 

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,7 @@ 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 +46,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 +61,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 +76,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
 

tests/integration_tests/system/test_web_client_server_and_database.py

@@ -4,10 +4,9 @@ from typing import Tuple
 import pytest
 
 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.network.router import ACLAction, Router
+from primaite.simulator.network.hardware.nodes.host.server import Server
 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
@@ -44,9 +43,9 @@ def web_client_web_server_database(example_network) -> Tuple[Computer, Server, S
     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)
@@ -74,7 +73,7 @@ def web_client_web_server_database(example_network) -> Tuple[Computer, Server, S
     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)
@@ -86,7 +85,7 @@ def web_client_web_server_database(example_network) -> Tuple[Computer, Server, S
     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

tests/unit_tests/_primaite/_simulator/_network/_hardware/nodes/test_acl.py

@@ -1,6 +1,6 @@
 from ipaddress import IPv4Address
 
-from primaite.simulator.network.hardware.nodes.router import ACLAction, Router
+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
 

tests/unit_tests/_primaite/_simulator/_network/_hardware/nodes/test_switch.py

@@ -1,7 +1,7 @@
 import pytest
 
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.switch import Switch
+from primaite.simulator.network.hardware.nodes.network.switch import Switch
 
 
 @pytest.fixture(scope="function")

tests/unit_tests/_primaite/_simulator/_network/_hardware/test_nic.py

@@ -29,21 +29,21 @@ def test_invalid_oui_mac_address():
 
 def test_nic_ip_address_type_conversion():
     """Tests NIC IP and gateway address is converted to IPv4Address is originally a string."""
-    nic = NIC(
+    network_interface = NIC(
         ip_address="192.168.1.2",
         subnet_mask="255.255.255.0",
     )
-    assert isinstance(nic.ip_address, IPv4Address)
+    assert isinstance(network_interface.ip_address, IPv4Address)
 
 
 def test_nic_deserialize():
     """Tests NIC serialization and deserialization."""
-    nic = NIC(
+    network_interface = NIC(
         ip_address="192.168.1.2",
         subnet_mask="255.255.255.0",
     )
 
-    nic_json = nic.model_dump_json()
+    nic_json = network_interface.model_dump_json()
     deserialized_nic = NIC.model_validate_json(nic_json)
     assert nic_json == deserialized_nic.model_dump_json()
 

tests/unit_tests/_primaite/_simulator/_network/test_container.py

@@ -5,9 +5,7 @@ import pytest
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.base import Link, Node
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.computer import Computer
-from primaite.simulator.system.applications.database_client import DatabaseClient
-from primaite.simulator.system.services.database.database_service import DatabaseService
+from primaite.simulator.network.hardware.nodes.host.computer import Computer
 
 
 def filter_keys_nested_item(data, keys):

tests/unit_tests/_primaite/_simulator/_system/_applications/_red_applications/test_dos_bot.py

@@ -3,7 +3,7 @@ from ipaddress import IPv4Address
 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.network.transmission.transport_layer import Port
 from primaite.simulator.system.applications.application import ApplicationOperatingState
 from primaite.simulator.system.applications.red_applications.dos_bot import DoSAttackStage, DoSBot

tests/unit_tests/_primaite/_simulator/_system/_applications/test_database_client.py

@@ -1,11 +1,11 @@
 from ipaddress import IPv4Address
-from typing import Tuple, Union
+from typing import Tuple
 from uuid import uuid4
 
 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 ApplicationOperatingState
 from primaite.simulator.system.applications.database_client import DatabaseClient
 

tests/unit_tests/_primaite/_simulator/_system/_applications/test_web_browser.py

@@ -1,9 +1,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.network.protocols.http import HttpResponsePacket, HttpStatusCode
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port

tests/unit_tests/_primaite/_simulator/_system/_services/test_dns_client.py

@@ -4,7 +4,7 @@ import pytest
 
 from primaite.simulator.network.hardware.base import Node
 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.network.protocols.dns import DNSPacket, DNSReply, DNSRequest
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port

tests/unit_tests/_primaite/_simulator/_system/_services/test_dns_server.py

@@ -4,7 +4,7 @@ import pytest
 
 from primaite.simulator.network.hardware.base import Node
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.network.protocols.dns import DNSPacket, DNSRequest
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port

tests/unit_tests/_primaite/_simulator/_system/_services/test_ftp_client.py

@@ -5,7 +5,7 @@ import pytest
 from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
 from primaite.simulator.network.hardware.base import Node
 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.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

tests/unit_tests/_primaite/_simulator/_system/_services/test_ftp_server.py

@@ -3,7 +3,7 @@ import pytest
 from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
 from primaite.simulator.network.hardware.base import Node
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.hardware.nodes.host.server import Server
 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

tests/unit_tests/_primaite/_simulator/_system/_services/test_web_server.py

@@ -1,7 +1,7 @@
 import pytest
 
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
-from primaite.simulator.network.hardware.nodes.server import Server
+from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.network.protocols.http import (
     HttpRequestMethod,
     HttpRequestPacket,