#2887 - Node class changes to address some test failures. Addressed some inconsistencies around operating_state, amended instantiation of some Nodes in test environments

tests/integration_tests/game_layer/actions/test_node_request_permission.py

@@ -35,7 +35,7 @@ def test_node_startup_shutdown(game_and_agent_fixture: Tuple[PrimaiteGame, Proxy
 
     assert client_1.operating_state == NodeOperatingState.SHUTTING_DOWN
 
-    for i in range(client_1.shut_down_duration + 1):
+    for i in range(client_1.config.shut_down_duration + 1):
         action = ("do_nothing", {})
         agent.store_action(action)
         game.step()
@@ -49,7 +49,7 @@ def test_node_startup_shutdown(game_and_agent_fixture: Tuple[PrimaiteGame, Proxy
 
     assert client_1.operating_state == NodeOperatingState.BOOTING
 
-    for i in range(client_1.start_up_duration + 1):
+    for i in range(client_1.config.start_up_duration + 1):
         action = ("do_nothing", {})
         agent.store_action(action)
         game.step()
@@ -79,7 +79,7 @@ def test_node_cannot_be_shut_down_if_node_is_already_off(game_and_agent_fixture:
     client_1 = game.simulation.network.get_node_by_hostname("client_1")
     client_1.power_off()
 
-    for i in range(client_1.shut_down_duration + 1):
+    for i in range(client_1.config.shut_down_duration + 1):
         action = ("do_nothing", {})
         agent.store_action(action)
         game.step()

tests/integration_tests/game_layer/observations/test_firewall_observation.py

@@ -117,7 +117,9 @@ def test_firewall_observation():
     assert all(observation["PORTS"][i]["operating_status"] == 2 for i in range(1, 4))
 
     # connect a switch to the firewall and check that only the correct port is updated
-    switch: Switch = Switch.from_config(config={"type": "switch", "hostname":"switch", "num_ports":1, "operating_state":NodeOperatingState.ON})
+    switch: Switch = Switch.from_config(
+        config={"type": "switch", "hostname": "switch", "num_ports": 1, "operating_state": NodeOperatingState.ON}
+    )
     link = net.connect(firewall.network_interface[1], switch.network_interface[1])
     assert firewall.network_interface[1].enabled
     observation = firewall_observation.observe(firewall.describe_state())

tests/integration_tests/game_layer/observations/test_link_observations.py

@@ -56,12 +56,26 @@ def test_link_observation():
     """Check the shape and contents of the link observation."""
     net = Network()
     sim = Simulation(network=net)
-    switch: Switch = Switch.from_config(config={"type":"switch", "hostname":"switch", "num_ports":5, "operating_state":NodeOperatingState.ON})
-    computer_1: Computer = Computer.from_config(config={"type": "computer",
-        "hostname":"computer_1", "ip_address":"10.0.0.1", "subnet_mask":"255.255.255.0", "start_up_duration":0}
+    switch: Switch = Switch.from_config(
+        config={"type": "switch", "hostname": "switch", "num_ports": 5, "operating_state": NodeOperatingState.ON}
     )
-    computer_2: Computer = Computer.from_config(config={"type":"computer",
-        "hostname":"computer_2", "ip_address":"10.0.0.2", "subnet_mask":"255.255.255.0", "start_up_duration":0}
+    computer_1: Computer = Computer.from_config(
+        config={
+            "type": "computer",
+            "hostname": "computer_1",
+            "ip_address": "10.0.0.1",
+            "subnet_mask": "255.255.255.0",
+            "start_up_duration": 0,
+        }
+    )
+    computer_2: Computer = Computer.from_config(
+        config={
+            "type": "computer",
+            "hostname": "computer_2",
+            "ip_address": "10.0.0.2",
+            "subnet_mask": "255.255.255.0",
+            "start_up_duration": 0,
+        }
     )
     computer_1.power_on()
     computer_2.power_on()

tests/integration_tests/game_layer/observations/test_nic_observations.py

@@ -163,7 +163,9 @@ def test_nic_monitored_traffic(simulation):
     pc2: Computer = simulation.network.get_node_by_hostname("client_2")
 
     nic_obs = NICObservation(
-        where=["network", "nodes", pc.config.hostname, "NICs", 1], include_nmne=False, monitored_traffic=monitored_traffic
+        where=["network", "nodes", pc.config.hostname, "NICs", 1],
+        include_nmne=False,
+        monitored_traffic=monitored_traffic,
     )
 
     simulation.pre_timestep(0)  # apply timestep to whole sim

tests/integration_tests/game_layer/observations/test_router_observation.py

@@ -16,7 +16,9 @@ from primaite.utils.validation.port import PORT_LOOKUP
 def test_router_observation():
     """Test adding/removing acl rules and enabling/disabling ports."""
     net = Network()
-    router = Router.from_config(config={"type": "router", "hostname":"router", "num_ports":5, "operating_state":NodeOperatingState.ON})
+    router = Router.from_config(
+        config={"type": "router", "hostname": "router", "num_ports": 5, "operating_state": NodeOperatingState.ON}
+    )
 
     ports = [PortObservation(where=["NICs", i]) for i in range(1, 6)]
     acl = ACLObservation(
@@ -89,7 +91,9 @@ def test_router_observation():
     assert all(observed_output["PORTS"][i]["operating_status"] == 2 for i in range(1, 6))
 
     # connect a switch to the router and check that only the correct port is updated
-    switch: Switch = Switch.from_config(config={"type": "switch", "hostname":"switch", "num_ports":1, "operating_state":NodeOperatingState.ON})
+    switch: Switch = Switch.from_config(
+        config={"type": "switch", "hostname": "switch", "num_ports": 1, "operating_state": NodeOperatingState.ON}
+    )
     link = net.connect(router.network_interface[1], switch.network_interface[1])
     assert router.network_interface[1].enabled
     observed_output = router_observation.observe(router.describe_state())

tests/integration_tests/game_layer/test_action_mask.py

@@ -2,8 +2,8 @@
 from primaite.session.environment import PrimaiteGymEnv
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
 from primaite.simulator.network.hardware.nodes.host.host_node import HostNode
-from primaite.simulator.system.services.service import ServiceOperatingState
 from primaite.simulator.network.hardware.nodes.network.wireless_router import WirelessRouter
+from primaite.simulator.system.services.service import ServiceOperatingState
 from tests.conftest import TEST_ASSETS_ROOT
 
 CFG_PATH = TEST_ASSETS_ROOT / "configs/test_primaite_session.yaml"

tests/integration_tests/game_layer/test_actions.py

@@ -17,11 +17,11 @@ from typing import Tuple
 import pytest
 import yaml
 
-from primaite.simulator.network.hardware.nodes.network.firewall import Firewall
 from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.session.environment import PrimaiteGymEnv
 from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
+from primaite.simulator.network.hardware.nodes.network.firewall import Firewall
 from primaite.simulator.system.applications.application import ApplicationOperatingState
 from primaite.simulator.system.applications.web_browser import WebBrowser
 from primaite.simulator.system.software import SoftwareHealthState

tests/integration_tests/game_layer/test_observations.py

@@ -8,14 +8,17 @@ from primaite.simulator.sim_container import Simulation
 
 def test_file_observation():
     sim = Simulation()
-    pc = Computer(hostname="beep", ip_address="123.123.123.123", subnet_mask="255.255.255.0")
+    pc: Computer = Computer.from_config(config={"type":"computer",
+                                                "hostname":"beep",
+                                                "ip_address":"123.123.123.123",
+                                                "subnet_mask":"255.255.255.0"})
     sim.network.add_node(pc)
     f = pc.file_system.create_file(file_name="dog.png")
 
     state = sim.describe_state()
 
     dog_file_obs = FileObservation(
-        where=["network", "nodes", pc.hostname, "file_system", "folders", "root", "files", "dog.png"],
+        where=["network", "nodes", pc.config.hostname, "file_system", "folders", "root", "files", "dog.png"],
         include_num_access=False,
         file_system_requires_scan=False,
     )