Fix airspace and remaining port problems from refactor

tests/integration_tests/game_layer/observations/test_acl_observations.py

@@ -38,8 +38,8 @@ def test_acl_observations(simulation):
     acl_obs = ACLObservation(
         where=["network", "nodes", router.hostname, "acl", "acl"],
         ip_list=[],
-        port_list=["NTP", "HTTP", "POSTGRES_SERVER"],
-        protocol_list=["TCP", "UDP", "ICMP"],
+        port_list=[123, 80, 5432],
+        protocol_list=["tcp", "udp", "icmp"],
         num_rules=10,
         wildcard_list=[],
     )

tests/integration_tests/game_layer/observations/test_firewall_observation.py

@@ -31,8 +31,8 @@ def test_firewall_observation():
         num_rules=7,
         ip_list=["10.0.0.1", "10.0.0.2"],
         wildcard_list=["0.0.0.255", "0.0.0.1"],
-        port_list=["HTTP", "DNS"],
-        protocol_list=["TCP"],
+        port_list=[80, 53],
+        protocol_list=["tcp"],
         include_users=False,
     )
 

tests/integration_tests/game_layer/observations/test_nic_observations.py

@@ -152,7 +152,12 @@ def test_config_nic_categories(simulation):
 
 
 def test_nic_monitored_traffic(simulation):
-    monitored_traffic = {"icmp": ["NONE"], "tcp": [53,]}
+    monitored_traffic = {
+        "icmp": ["NONE"],
+        "tcp": [
+            53,
+        ],
+    }
 
     pc: Computer = simulation.network.get_node_by_hostname("client_1")
     pc2: Computer = simulation.network.get_node_by_hostname("client_2")

tests/integration_tests/game_layer/observations/test_router_observation.py

@@ -24,8 +24,8 @@ def test_router_observation():
         num_rules=7,
         ip_list=["10.0.0.1", "10.0.0.2"],
         wildcard_list=["0.0.0.255", "0.0.0.1"],
-        port_list=["HTTP", "DNS"],
-        protocol_list=["TCP"],
+        port_list=[80, 53],
+        protocol_list=["tcp"],
     )
     router_observation = RouterObservation(where=[], ports=ports, num_ports=8, acl=acl, include_users=False)