Fix airspace and remaining port problems from refactor

src/primaite/simulator/system/applications/application.py

@@ -44,7 +44,7 @@ class Application(IOSoftware):
     _registry: ClassVar[Dict[str, Type["Application"]]] = {}
     """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 an application type.
 
@@ -52,7 +52,7 @@ class Application(IOSoftware):
         :type identifier: str
         :raises ValueError: When attempting to register an application with a name that is already allocated.
         """
-        if identifier == 'default':
+        if identifier == "default":
             return
         super().__init_subclass__(**kwargs)
         if identifier in cls._registry:

src/primaite/simulator/system/applications/red_applications/c2/c2_beacon.py

@@ -1,5 +1,4 @@
 # © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
-from enum import Enum
 from ipaddress import IPv4Address
 from typing import Dict, Optional
 

src/primaite/simulator/system/core/session_manager.py

@@ -76,9 +76,7 @@ class SessionManager:
     """
 
     def __init__(self, sys_log: SysLog):
-        self.sessions_by_key: Dict[
-            Tuple[str, IPv4Address, IPv4Address, Optional[int], Optional[int]], Session
-        ] = {}
+        self.sessions_by_key: Dict[Tuple[str, IPv4Address, IPv4Address, Optional[int], Optional[int]], Session] = {}
         self.sessions_by_uuid: Dict[str, Session] = {}
         self.sys_log: SysLog = sys_log
         self.software_manager: SoftwareManager = None  # Noqa

src/primaite/simulator/system/services/ftp/ftp_service.py

@@ -5,7 +5,6 @@ from typing import Dict, Optional
 
 from primaite.simulator.file_system.file_system import File
 from primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode
-from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.services.service import Service
 
 

src/primaite/simulator/system/services/service.py

@@ -52,7 +52,7 @@ class Service(IOSoftware):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-    def __init_subclass__(cls, identifier: str = 'default', **kwargs: Any) -> None:
+    def __init_subclass__(cls, identifier: str = "default", **kwargs: Any) -> None:
         """
         Register a hostnode type.
 
@@ -60,7 +60,7 @@ class Service(IOSoftware):
         :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/system/software.py

@@ -14,7 +14,6 @@ from primaite.simulator.core import RequestManager, RequestType, SimComponent
 from primaite.simulator.file_system.file_system import FileSystem, Folder
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
 from primaite.simulator.network.transmission.network_layer import IPProtocol
-from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.core.session_manager import Session
 from primaite.simulator.system.core.sys_log import SysLog