#1947: node startup/shutdown now take multiple timesteps to complete

tests/integration_tests/network/test_frame_transmission.py

@@ -1,17 +1,15 @@
-from primaite.simulator.network.hardware.base import Link, NIC, Node
+from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
 
 
 def test_node_to_node_ping():
     """Tests two Nodes are able to ping each other."""
-    node_a = Node(hostname="node_a")
-    nic_a = NIC(ip_address="192.168.0.10", subnet_mask="255.255.255.0")
+    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.power_on()
 
-    node_b = Node(hostname="node_b")
+    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)
-    node_b.power_on()
 
     Link(endpoint_a=nic_a, endpoint_b=nic_b)
 
@@ -20,22 +18,19 @@ def test_node_to_node_ping():
 
 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")
+    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_a.power_on()
 
-    node_b = Node(hostname="node_b")
+    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_b.power_on()
 
-    node_c = Node(hostname="node_c")
+    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_c.power_on()
 
     Link(endpoint_a=nic_a, endpoint_b=nic_b1)
 

tests/integration_tests/network/test_link_connection.py

@@ -1,17 +1,15 @@
-from primaite.simulator.network.hardware.base import Link, NIC, Node
+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")
+    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_a.power_on()
 
-    node_b = Node(hostname="node_b")
+    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)
-    node_b.power_on()
 
     link = Link(endpoint_a=nic_a, endpoint_b=nic_b)
 

tests/integration_tests/network/test_routing.py

@@ -2,7 +2,7 @@ from typing import Tuple
 
 import pytest
 
-from primaite.simulator.network.hardware.base import Link, NIC, Node
+from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
 from primaite.simulator.network.hardware.nodes.router import ACLAction, Router
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
@@ -10,18 +10,15 @@ from primaite.simulator.network.transmission.transport_layer import Port
 
 @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")
+    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)
-    pc_a.power_on()
 
-    pc_b = Node(hostname="pc_b", default_gateway="192.168.1.1")
+    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.power_on()
 
-    router_1 = Router(hostname="router_1")
-    router_1.power_on()
+    router_1 = Router(hostname="router_1", operating_state=NodeOperatingState.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")

tests/integration_tests/network/test_switched_network.py

@@ -1,4 +1,4 @@
-from primaite.simulator.network.hardware.base import Link
+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
@@ -7,17 +7,22 @@ from primaite.simulator.network.hardware.nodes.switch import Switch
 def test_switched_network():
     """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"
+        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,
     )
-    client_1.power_on()
 
     server_1 = Server(
-        hostname=" server_1", ip_address="192.168.1.11", subnet_mask="255.255.255.0", default_gateway="192.168.1.11"
+        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,
     )
-    server_1.power_on()
 
-    switch_1 = Switch(hostname="switch_1", num_ports=6)
-    switch_1.power_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])

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

@@ -11,13 +11,31 @@ def node() -> Node:
 def test_node_startup(node):
     assert node.operating_state == NodeOperatingState.OFF
     node.apply_request(["startup"])
+    assert node.operating_state == NodeOperatingState.BOOTING
+
+    idx = 0
+    while node.operating_state == NodeOperatingState.BOOTING:
+        node.apply_timestep(timestep=idx)
+        idx += 1
+
     assert node.operating_state == NodeOperatingState.ON
 
 
 def test_node_shutdown(node):
     assert node.operating_state == NodeOperatingState.OFF
     node.apply_request(["startup"])
+    idx = 0
+    while node.operating_state == NodeOperatingState.BOOTING:
+        node.apply_timestep(timestep=idx)
+        idx += 1
+
     assert node.operating_state == NodeOperatingState.ON
 
     node.apply_request(["shutdown"])
+
+    idx = 0
+    while node.operating_state == NodeOperatingState.SHUTTING_DOWN:
+        node.apply_timestep(timestep=idx)
+        idx += 1
+
     assert node.operating_state == NodeOperatingState.OFF