#2887 - Additional test failure fixes

tests/integration_tests/game_layer/observations/test_firewall_observation.py

@@ -25,7 +25,8 @@ def check_default_rules(acl_obs):
 def test_firewall_observation():
     """Test adding/removing acl rules and enabling/disabling ports."""
     net = Network()
-    firewall = Firewall(hostname="firewall", operating_state=NodeOperatingState.ON)
+    firewall_cfg = {"type": "firewall", "hostname": "firewall", "opertating_state": NodeOperatingState.ON}
+    firewall = Firewall.from_config(config=firewall_cfg)
     firewall_observation = FirewallObservation(
         where=[],
         num_rules=7,
@@ -116,7 +117,7 @@ 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(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,12 @@ def test_link_observation():
     """Check the shape and contents of the link observation."""
     net = Network()
     sim = Simulation(network=net)
-    switch = Switch(hostname="switch", num_ports=5, operating_state=NodeOperatingState.ON)
-    computer_1 = 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_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(
-        hostname="computer_2", ip_address="10.0.0.2", 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

@@ -75,7 +75,7 @@ def test_nic(simulation):
 
     nic: NIC = pc.network_interface[1]
 
-    nic_obs = NICObservation(where=["network", "nodes", pc.hostname, "NICs", 1], include_nmne=True)
+    nic_obs = NICObservation(where=["network", "nodes", pc.config.hostname, "NICs", 1], include_nmne=True)
 
     # Set the NMNE configuration to capture DELETE/ENCRYPT queries as MNEs
     nmne_config = {
@@ -108,7 +108,7 @@ def test_nic_categories(simulation):
     """Test the NIC observation nmne count categories."""
     pc: Computer = simulation.network.get_node_by_hostname("client_1")
 
-    nic_obs = NICObservation(where=["network", "nodes", pc.hostname, "NICs", 1], include_nmne=True)
+    nic_obs = NICObservation(where=["network", "nodes", pc.config.hostname, "NICs", 1], include_nmne=True)
 
     assert nic_obs.high_nmne_threshold == 10  # default
     assert nic_obs.med_nmne_threshold == 5  # default
@@ -163,7 +163,7 @@ def test_nic_monitored_traffic(simulation):
     pc2: Computer = simulation.network.get_node_by_hostname("client_2")
 
     nic_obs = NICObservation(
-        where=["network", "nodes", pc.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_node_observations.py

@@ -25,7 +25,7 @@ def test_host_observation(simulation):
     pc: Computer = simulation.network.get_node_by_hostname("client_1")
 
     host_obs = HostObservation(
-        where=["network", "nodes", pc.hostname],
+        where=["network", "nodes", pc.config.hostname],
         num_applications=0,
         num_files=1,
         num_folders=1,
@@ -56,7 +56,7 @@ def test_host_observation(simulation):
     observation_state = host_obs.observe(simulation.describe_state())
     assert observation_state.get("operating_status") == 4  # shutting down
 
-    for i in range(pc.shut_down_duration + 1):
+    for i in range(pc.config.shut_down_duration + 1):
         pc.apply_timestep(i)
 
     observation_state = host_obs.observe(simulation.describe_state())

tests/integration_tests/game_layer/observations/test_router_observation.py

@@ -16,7 +16,7 @@ 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(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 +89,7 @@ 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(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/observations/test_software_observations.py

@@ -29,7 +29,7 @@ def test_service_observation(simulation):
     ntp_server = pc.software_manager.software.get("NTPServer")
     assert ntp_server
 
-    service_obs = ServiceObservation(where=["network", "nodes", pc.hostname, "services", "NTPServer"])
+    service_obs = ServiceObservation(where=["network", "nodes", pc.config.hostname, "services", "NTPServer"])
 
     assert service_obs.space["operating_status"] == spaces.Discrete(7)
     assert service_obs.space["health_status"] == spaces.Discrete(5)
@@ -54,7 +54,7 @@ def test_application_observation(simulation):
     web_browser: WebBrowser = pc.software_manager.software.get("WebBrowser")
     assert web_browser
 
-    app_obs = ApplicationObservation(where=["network", "nodes", pc.hostname, "applications", "WebBrowser"])
+    app_obs = ApplicationObservation(where=["network", "nodes", pc.config.hostname, "applications", "WebBrowser"])
 
     web_browser.close()
     observation_state = app_obs.observe(simulation.describe_state())

tests/integration_tests/game_layer/test_action_mask.py

@@ -3,6 +3,7 @@ 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 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,6 +17,7 @@ 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