#2417 Remove references to old obs names and add link obs

tests/integration_tests/game_layer/observations/test_acl_observations.py

@@ -1,6 +1,6 @@
 import pytest
 
-from primaite.game.agent.observations.observations import AclObservation
+from primaite.game.agent.observations.acl_observation import ACLObservation
 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.transport_layer import Port
@@ -34,7 +34,7 @@ def test_acl_observations(simulation):
     # add router acl rule
     router.acl.add_rule(action=ACLAction.PERMIT, dst_port=Port.NTP, src_port=Port.NTP, position=1)
 
-    acl_obs = AclObservation(
+    acl_obs = ACLObservation(
         where=["network", "nodes", router.hostname, "acl", "acl"],
         node_ip_to_id={},
         ports=["NTP", "HTTP", "POSTGRES_SERVER"],

tests/integration_tests/game_layer/observations/test_link_observations.py

@@ -1,7 +1,7 @@
 import pytest
 from gymnasium import spaces
 
-from primaite.game.agent.observations.observations import LinkObservation
+from primaite.game.agent.observations.link_observation import LinkObservation
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.base import Link, Node
 from primaite.simulator.network.hardware.nodes.host.computer import Computer

tests/integration_tests/game_layer/observations/test_nic_observations.py

@@ -5,7 +5,7 @@ import pytest
 import yaml
 from gymnasium import spaces
 
-from primaite.game.agent.observations.nic_observations import NicObservation
+from primaite.game.agent.observations.nic_observations import NICObservation
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.network.hardware.nodes.host.host_node import NIC
@@ -40,7 +40,7 @@ def test_nic(simulation):
 
     nic: NIC = pc.network_interface[1]
 
-    nic_obs = NicObservation(where=["network", "nodes", pc.hostname, "NICs", 1])
+    nic_obs = NICObservation(where=["network", "nodes", pc.hostname, "NICs", 1])
 
     assert nic_obs.space["nic_status"] == spaces.Discrete(3)
     assert nic_obs.space["NMNE"]["inbound"] == spaces.Discrete(4)
@@ -61,13 +61,13 @@ 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])
+    nic_obs = NICObservation(where=["network", "nodes", pc.hostname, "NICs", 1])
 
     assert nic_obs.high_nmne_threshold == 10  # default
     assert nic_obs.med_nmne_threshold == 5  # default
     assert nic_obs.low_nmne_threshold == 0  # default
 
-    nic_obs = NicObservation(
+    nic_obs = NICObservation(
         where=["network", "nodes", pc.hostname, "NICs", 1],
         low_nmne_threshold=3,
         med_nmne_threshold=6,
@@ -80,7 +80,7 @@ def test_nic_categories(simulation):
 
     with pytest.raises(Exception):
         # should throw an error
-        NicObservation(
+        NICObservation(
             where=["network", "nodes", pc.hostname, "NICs", 1],
             low_nmne_threshold=9,
             med_nmne_threshold=6,
@@ -89,7 +89,7 @@ def test_nic_categories(simulation):
 
     with pytest.raises(Exception):
         # should throw an error
-        NicObservation(
+        NICObservation(
             where=["network", "nodes", pc.hostname, "NICs", 1],
             low_nmne_threshold=3,
             med_nmne_threshold=9,

tests/integration_tests/game_layer/observations/test_node_observations.py

@@ -4,7 +4,7 @@ from uuid import uuid4
 import pytest
 from gymnasium import spaces
 
-from primaite.game.agent.observations.node_observations import NodeObservation
+from primaite.game.agent.observations.host_observations import HostObservation
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.sim_container import Simulation
 
@@ -23,7 +23,7 @@ def test_node_observation(simulation):
     """Test a Node observation."""
     pc: Computer = simulation.network.get_node_by_hostname("client_1")
 
-    node_obs = NodeObservation(where=["network", "nodes", pc.hostname])
+    node_obs = HostObservation(where=["network", "nodes", pc.hostname])
 
     assert node_obs.space["operating_status"] == spaces.Discrete(5)
 

tests/integration_tests/network/test_capture_nmne.py

@@ -1,4 +1,4 @@
-from primaite.game.agent.observations.nic_observations import NicObservation
+from primaite.game.agent.observations.nic_observations import NICObservation
 from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.network.nmne import set_nmne_config
 from primaite.simulator.sim_container import Simulation
@@ -141,9 +141,9 @@ def test_describe_state_nmne(uc2_network):
 
 def test_capture_nmne_observations(uc2_network):
     """
-    Tests the NicObservation class's functionality within a simulated network environment.
+    Tests the NICObservation class's functionality within a simulated network environment.
 
-    This test ensures the observation space, as defined by instances of NicObservation, accurately reflects the
+    This test ensures the observation space, as defined by instances of NICObservation, accurately reflects the
     number of MNEs detected based on network activities over multiple iterations.
 
     The test employs a series of "DELETE" SQL operations, considered as MNEs, to validate the dynamic update
@@ -168,8 +168,8 @@ def test_capture_nmne_observations(uc2_network):
     set_nmne_config(nmne_config)
 
     # Define observations for the NICs  of the database and web servers
-    db_server_nic_obs = NicObservation(where=["network", "nodes", "database_server", "NICs", 1])
-    web_server_nic_obs = NicObservation(where=["network", "nodes", "web_server", "NICs", 1])
+    db_server_nic_obs = NICObservation(where=["network", "nodes", "database_server", "NICs", 1])
+    web_server_nic_obs = NICObservation(where=["network", "nodes", "web_server", "NICs", 1])
 
     # Iterate through a set of test cases to simulate multiple DELETE queries
     for i in range(0, 20):