#2445: apply PR suggestions

tests/integration_tests/configuration_file_parsing/test_game_options_config.py

@@ -34,9 +34,9 @@ def test_nmne_threshold():
 
     # get NIC observation
     nic_obs = game.agents["defender"].observation_manager.obs.components["NODES"].hosts[0].nics[0]
-    assert nic_obs.low_threshold == 5
-    assert nic_obs.med_threshold == 25
-    assert nic_obs.high_threshold == 100
+    assert nic_obs.low_nmne_threshold == 5
+    assert nic_obs.med_nmne_threshold == 25
+    assert nic_obs.high_nmne_threshold == 100
 
 
 def test_file_access_threshold():
@@ -47,9 +47,9 @@ def test_file_access_threshold():
 
     # get file observation
     file_obs = game.agents["defender"].observation_manager.obs.components["NODES"].hosts[0].folders[0].files[0]
-    assert file_obs.low_threshold == 2
-    assert file_obs.med_threshold == 5
-    assert file_obs.high_threshold == 10
+    assert file_obs.low_file_access_threshold == 2
+    assert file_obs.med_file_access_threshold == 5
+    assert file_obs.high_file_access_threshold == 10
 
 
 def test_app_executions_threshold():
@@ -60,6 +60,6 @@ def test_app_executions_threshold():
 
     # get application observation
     app_obs = game.agents["defender"].observation_manager.obs.components["NODES"].hosts[0].applications[0]
-    assert app_obs.low_threshold == 2
-    assert app_obs.med_threshold == 3
-    assert app_obs.high_threshold == 5
+    assert app_obs.low_app_execution_threshold == 2
+    assert app_obs.med_app_execution_threshold == 3
+    assert app_obs.high_app_execution_threshold == 5

tests/integration_tests/game_layer/observations/test_file_system_observations.py

@@ -53,9 +53,9 @@ def test_config_file_access_categories(simulation):
         thresholds={"file_access": {"low": 3, "medium": 6, "high": 9}},
     )
 
-    assert file_obs.high_threshold == 9
-    assert file_obs.med_threshold == 6
-    assert file_obs.low_threshold == 3
+    assert file_obs.high_file_access_threshold == 9
+    assert file_obs.med_file_access_threshold == 6
+    assert file_obs.low_file_access_threshold == 3
 
     with pytest.raises(Exception):
         # should throw an error

tests/integration_tests/game_layer/observations/test_nic_observations.py

@@ -118,9 +118,9 @@ def test_nic_categories(simulation):
 
     nic_obs = NICObservation(where=["network", "nodes", pc.hostname, "NICs", 1], include_nmne=True)
 
-    assert nic_obs.high_threshold == 10  # default
-    assert nic_obs.med_threshold == 5  # default
-    assert nic_obs.low_threshold == 0  # default
+    assert nic_obs.high_nmne_threshold == 10  # default
+    assert nic_obs.med_nmne_threshold == 5  # default
+    assert nic_obs.low_nmne_threshold == 0  # default
 
 
 def test_config_nic_categories(simulation):
@@ -131,9 +131,9 @@ def test_config_nic_categories(simulation):
         include_nmne=True,
     )
 
-    assert nic_obs.high_threshold == 9
-    assert nic_obs.med_threshold == 6
-    assert nic_obs.low_threshold == 3
+    assert nic_obs.high_nmne_threshold == 9
+    assert nic_obs.med_nmne_threshold == 6
+    assert nic_obs.low_nmne_threshold == 3
 
     with pytest.raises(Exception):
         # should throw an error

tests/integration_tests/game_layer/observations/test_software_observations.py

@@ -84,9 +84,9 @@ def test_application_executions_categories(simulation):
         thresholds={"app_executions": {"low": 3, "medium": 6, "high": 9}},
     )
 
-    assert app_obs.high_threshold == 9
-    assert app_obs.med_threshold == 6
-    assert app_obs.low_threshold == 3
+    assert app_obs.high_app_execution_threshold == 9
+    assert app_obs.med_app_execution_threshold == 6
+    assert app_obs.low_app_execution_threshold == 3
 
     with pytest.raises(Exception):
         # should throw an error