Fix airspace and remaining port problems from refactor

src/primaite/simulator/network/hardware/nodes/host/host_node.py

@@ -332,7 +332,7 @@ class HostNode(Node):
         super().__init__(**kwargs)
         self.connect_nic(NIC(ip_address=ip_address, subnet_mask=subnet_mask))
 
-    def __init_subclass__(cls, identifier: str = 'default', **kwargs: Any) -> None:
+    def __init_subclass__(cls, identifier: str = "default", **kwargs: Any) -> None:
         """
         Register a hostnode type.
 
@@ -340,7 +340,7 @@ class HostNode(Node):
         :type identifier: str
         :raises ValueError: When attempting to register an hostnode with a name that is already allocated.
         """
-        if identifier == 'default':
+        if identifier == "default":
             return
         # Enforce lowercase registry entries because it makes comparisons everywhere else much easier.
         identifier = identifier.lower()

src/primaite/simulator/network/hardware/nodes/network/network_node.py

@@ -19,7 +19,7 @@ class NetworkNode(Node):
     _registry: ClassVar[Dict[str, Type["NetworkNode"]]] = {}
     """Registry of application types. Automatically populated when subclasses are defined."""
 
-    def __init_subclass__(cls, identifier: str = 'default', **kwargs: Any) -> None:
+    def __init_subclass__(cls, identifier: str = "default", **kwargs: Any) -> None:
         """
         Register a networknode type.
 
@@ -27,7 +27,7 @@ class NetworkNode(Node):
         :type identifier: str
         :raises ValueError: When attempting to register an networknode with a name that is already allocated.
         """
-        if identifier == 'default':
+        if identifier == "default":
             return
         identifier = identifier.lower()
         super().__init_subclass__(**kwargs)

src/primaite/simulator/network/hardware/nodes/network/router.py

@@ -130,19 +130,20 @@ class ACLRule(SimComponent):
     dst_port: Optional[int] = None
     match_count: int = 0
 
-    @field_validator('protocol', mode='before')
-    def protocol_valid(cls, val:Optional[str]) -> Optional[str]:
+    @field_validator("protocol", mode="before")
+    def protocol_valid(cls, val: Optional[str]) -> Optional[str]:
+        """Assert that the protocol for the rule is predefined in the IPProtocol lookup."""
         if val is not None:
             assert val in IPProtocol.values(), f"Cannot create ACL rule with invalid protocol {val}"
         return val
 
-    @field_validator('src_port', 'dst_port', mode='before')
-    def ports_valid(cls, val:Optional[int]) -> Optional[int]:
+    @field_validator("src_port", "dst_port", mode="before")
+    def ports_valid(cls, val: Optional[int]) -> Optional[int]:
+        """Assert that the port for the rule is predefined in the Port lookup."""
         if val is not None:
             assert val in Port.values(), f"Cannot create ACL rule with invalid port {val}"
         return val
 
-
     def __str__(self) -> str:
         rule_strings = []
         for key, value in self.model_dump(exclude={"uuid", "request_manager"}).items():

src/primaite/simulator/network/hardware/nodes/network/wireless_router.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, Optional, Union
 
 from pydantic import validate_call
 
-from primaite.simulator.network.airspace import AirSpace, AirSpaceFrequency, IPWirelessNetworkInterface
+from primaite.simulator.network.airspace import AirSpace, IPWirelessNetworkInterface
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
 from primaite.simulator.network.hardware.nodes.network.router import ACLAction, Router, RouterInterface
 from primaite.simulator.network.transmission.data_link_layer import Frame
@@ -116,7 +116,7 @@ class WirelessRouter(Router):
         >>> wireless_router.configure_wireless_access_point(
         ...     ip_address="10.10.10.1",
         ...     subnet_mask="255.255.255.0"
-        ...     frequency=AirSpaceFrequency["WIFI_2_4"]
+        ...     frequency="WIFI_2_4"
         ... )
     """
 
@@ -153,7 +153,7 @@ class WirelessRouter(Router):
         self,
         ip_address: IPV4Address,
         subnet_mask: IPV4Address,
-        frequency: Optional[int] = AirSpaceFrequency["WIFI_2_4"],
+        frequency: Optional[str] = "WIFI_2_4",
     ):
         """
         Configures a wireless access point (WAP).
@@ -166,12 +166,12 @@ class WirelessRouter(Router):
 
         :param ip_address: The IP address to be assigned to the wireless access point.
         :param subnet_mask: The subnet mask associated with the IP address
-        :param frequency: The operating frequency of the wireless access point, defined by the AirSpaceFrequency
+        :param frequency: The operating frequency of the wireless access point, defined by the air space frequency
             enum. This determines the frequency band (e.g., 2.4 GHz or 5 GHz) the access point will use for wireless
-            communication. Default is AirSpaceFrequency["WIFI_2_4"].
+            communication. Default is "WIFI_2_4".
         """
         if not frequency:
-            frequency = AirSpaceFrequency["WIFI_2_4"]
+            frequency = "WIFI_2_4"
         self.sys_log.info("Configuring wireless access point")
 
         self.wireless_access_point.disable()  # Temporarily disable the WAP for reconfiguration
@@ -264,7 +264,7 @@ class WirelessRouter(Router):
         if "wireless_access_point" in cfg:
             ip_address = cfg["wireless_access_point"]["ip_address"]
             subnet_mask = cfg["wireless_access_point"]["subnet_mask"]
-            frequency = AirSpaceFrequency[cfg["wireless_access_point"]["frequency"]]
+            frequency = cfg["wireless_access_point"]["frequency"]
             router.configure_wireless_access_point(ip_address=ip_address, subnet_mask=subnet_mask, frequency=frequency)
 
         if "acl" in cfg: