Change ACL observation to 0-index and remove weird off-by-one offset

tests/integration_tests/game_layer/observations/test_acl_observations.py

@@ -47,7 +47,7 @@ def test_acl_observations(simulation):
     observation_space = acl_obs.observe(simulation.describe_state())
     assert observation_space.get(1) is not None
     rule_obs = observation_space.get(1)  # this is the ACL Rule added to allow NTP
-    assert rule_obs.get("position") == 0  # rule was put at position 1 (0 because counting from 1 instead of 1)
+    assert rule_obs.get("position") == 1  # rule was put at position 1
     assert rule_obs.get("permission") == 1  # permit = 1 deny = 2
     assert rule_obs.get("source_ip_id") == 1  # applies to all source nodes
     assert rule_obs.get("dest_ip_id") == 1  # applies to all destination nodes
@@ -60,7 +60,7 @@ def test_acl_observations(simulation):
     observation_space = acl_obs.observe(simulation.describe_state())
     assert observation_space.get(1) is not None
     rule_obs = observation_space.get(1)  # this is the ACL Rule added to allow NTP
-    assert rule_obs.get("position") == 0
+    assert rule_obs.get("position") == 1
     assert rule_obs.get("permission") == 0
     assert rule_obs.get("source_ip_id") == 0
     assert rule_obs.get("dest_ip_id") == 0

tests/integration_tests/game_layer/observations/test_firewall_observation.py

@@ -11,15 +11,15 @@ from primaite.utils.validation.port import PORT_LOOKUP
 
 def check_default_rules(acl_obs):
     assert len(acl_obs) == 7
-    assert all(acl_obs[i]["position"] == i - 1 for i in range(1, 8))
-    assert all(acl_obs[i]["permission"] == 0 for i in range(1, 8))
-    assert all(acl_obs[i]["source_ip_id"] == 0 for i in range(1, 8))
-    assert all(acl_obs[i]["source_wildcard_id"] == 0 for i in range(1, 8))
-    assert all(acl_obs[i]["source_port_id"] == 0 for i in range(1, 8))
-    assert all(acl_obs[i]["dest_ip_id"] == 0 for i in range(1, 8))
-    assert all(acl_obs[i]["dest_wildcard_id"] == 0 for i in range(1, 8))
-    assert all(acl_obs[i]["dest_port_id"] == 0 for i in range(1, 8))
-    assert all(acl_obs[i]["protocol_id"] == 0 for i in range(1, 8))
+    assert all(acl_obs[i]["position"] == i for i in range(7))
+    assert all(acl_obs[i]["permission"] == 0 for i in range(7))
+    assert all(acl_obs[i]["source_ip_id"] == 0 for i in range(7))
+    assert all(acl_obs[i]["source_wildcard_id"] == 0 for i in range(7))
+    assert all(acl_obs[i]["source_port_id"] == 0 for i in range(7))
+    assert all(acl_obs[i]["dest_ip_id"] == 0 for i in range(7))
+    assert all(acl_obs[i]["dest_wildcard_id"] == 0 for i in range(7))
+    assert all(acl_obs[i]["dest_port_id"] == 0 for i in range(7))
+    assert all(acl_obs[i]["protocol_id"] == 0 for i in range(7))
 
 
 def test_firewall_observation():
@@ -75,7 +75,7 @@ def test_firewall_observation():
 
     observation = firewall_observation.observe(firewall.describe_state())
     observed_rule = observation["ACL"]["INTERNAL"]["INBOUND"][5]
-    assert observed_rule["position"] == 4
+    assert observed_rule["position"] == 5
     assert observed_rule["permission"] == 2
     assert observed_rule["source_ip_id"] == 2
     assert observed_rule["source_wildcard_id"] == 3

tests/integration_tests/game_layer/observations/test_router_observation.py

@@ -53,7 +53,7 @@ def test_router_observation():
     # Observe the state using the RouterObservation instance
     observed_output = router_observation.observe(router.describe_state())
     observed_rule = observed_output["ACL"][5]
-    assert observed_rule["position"] == 4
+    assert observed_rule["position"] == 5
     assert observed_rule["permission"] == 2
     assert observed_rule["source_ip_id"] == 2
     assert observed_rule["source_wildcard_id"] == 3
@@ -77,7 +77,7 @@ def test_router_observation():
     )
     observed_output = router_observation.observe(router.describe_state())
     observed_rule = observed_output["ACL"][2]
-    assert observed_rule["position"] == 1
+    assert observed_rule["position"] == 2
     assert observed_rule["permission"] == 1
     assert observed_rule["source_ip_id"] == 1
     assert observed_rule["source_wildcard_id"] == 1