#2869 - Pull in changes from 4.0.0a1-dev and resolve conflicts

2025-01-03 09:54:11 +00:00
parent 2108b914e3 491de6fc47
commit 55ddcb7eb4
402 changed files with 481 additions and 404 deletions
--- a/tests/init.py
+++ b/tests/init.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from pathlib import Path
 from typing import Final

--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,5 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
-from typing import Any, Dict, Optional, Tuple
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
+from typing import Any, Dict, Tuple

 import pytest
 import yaml
--- a/tests/e2e_integration_tests/init.py
+++ b/tests/e2e_integration_tests/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/e2e_integration_tests/action_masking/init.py
+++ b/tests/e2e_integration_tests/action_masking/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/e2e_integration_tests/action_masking/test_agents_use_action_masks.py
+++ b/tests/e2e_integration_tests/action_masking/test_agents_use_action_masks.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Dict

 import pytest
--- a/tests/e2e_integration_tests/environments/init.py
+++ b/tests/e2e_integration_tests/environments/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/e2e_integration_tests/environments/test_rllib_multi_agent_environment.py
+++ b/tests/e2e_integration_tests/environments/test_rllib_multi_agent_environment.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import yaml
 from ray.rllib.algorithms.ppo import PPOConfig

--- a/tests/e2e_integration_tests/environments/test_rllib_single_agent_environment.py
+++ b/tests/e2e_integration_tests/environments/test_rllib_single_agent_environment.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import tempfile
 from pathlib import Path

--- a/tests/e2e_integration_tests/environments/test_sb3_environment.py
+++ b/tests/e2e_integration_tests/environments/test_sb3_environment.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 """Test that we can create a primaite environment and train sb3 agent with no crash."""
 import tempfile
 from pathlib import Path
--- a/tests/e2e_integration_tests/test_environment.py
+++ b/tests/e2e_integration_tests/test_environment.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pydantic
 import pytest
 import yaml
--- a/tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py
+++ b/tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import yaml

 from primaite.game.game import PrimaiteGame
--- a/tests/integration_tests/init.py
+++ b/tests/integration_tests/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/integration_tests/cli/init.py
+++ b/tests/integration_tests/cli/init.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import List

 from typer.testing import CliRunner, Result
--- a/tests/integration_tests/cli/test_dev_cli.py
+++ b/tests/integration_tests/cli/test_dev_cli.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import os
 import shutil
 import tempfile
--- a/tests/integration_tests/component_creation/init.py
+++ b/tests/integration_tests/component_creation/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/integration_tests/component_creation/test_action_integration.py
+++ b/tests/integration_tests/component_creation/test_action_integration.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.simulator.core import RequestType
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.network.hardware.nodes.host.server import Server
--- a/tests/integration_tests/component_creation/test_permission_system.py
+++ b/tests/integration_tests/component_creation/test_permission_system.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from enum import Enum
 from typing import Dict, List, Literal

--- a/tests/integration_tests/configuration_file_parsing/init.py
+++ b/tests/integration_tests/configuration_file_parsing/init.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from pathlib import Path
 from typing import Union

--- a/tests/integration_tests/configuration_file_parsing/nodes/init.py
+++ b/tests/integration_tests/configuration_file_parsing/nodes/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/integration_tests/configuration_file_parsing/nodes/network/init.py
+++ b/tests/integration_tests/configuration_file_parsing/nodes/network/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/integration_tests/configuration_file_parsing/nodes/network/test_firewall_config.py
+++ b/tests/integration_tests/configuration_file_parsing/nodes/network/test_firewall_config.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address

 import pytest
--- a/tests/integration_tests/configuration_file_parsing/nodes/network/test_router_config.py
+++ b/tests/integration_tests/configuration_file_parsing/nodes/network/test_router_config.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest

 from primaite.simulator.network.container import Network
--- a/tests/integration_tests/configuration_file_parsing/nodes/test_node_config.py
+++ b/tests/integration_tests/configuration_file_parsing/nodes/test_node_config.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.config.load import data_manipulation_config_path
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
--- a/tests/integration_tests/configuration_file_parsing/software_installation_and_configuration.py
+++ b/tests/integration_tests/configuration_file_parsing/software_installation_and_configuration.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from pathlib import Path
 from typing import Union
--- a/tests/integration_tests/configuration_file_parsing/test_episode_scheduler.py
+++ b/tests/integration_tests/configuration_file_parsing/test_episode_scheduler.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest
 import yaml

--- a/tests/integration_tests/configuration_file_parsing/test_game_options_config.py
+++ b/tests/integration_tests/configuration_file_parsing/test_game_options_config.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from pathlib import Path
 from typing import Union

--- a/tests/integration_tests/configuration_file_parsing/test_io_settings.py
+++ b/tests/integration_tests/configuration_file_parsing/test_io_settings.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from pathlib import Path
 from typing import Union

--- a/tests/integration_tests/configuration_file_parsing/test_no_nodes_links_agents_config.py
+++ b/tests/integration_tests/configuration_file_parsing/test_no_nodes_links_agents_config.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import yaml

 from primaite.game.game import PrimaiteGame
--- a/tests/integration_tests/configuration_file_parsing/test_software_fix_duration.py
+++ b/tests/integration_tests/configuration_file_parsing/test_software_fix_duration.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import copy
 from pathlib import Path
 from typing import Union
--- a/tests/integration_tests/extensions/applications/extended_application.py
+++ b/tests/integration_tests/extensions/applications/extended_application.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from enum import Enum
 from ipaddress import IPv4Address
 from typing import Dict, List, Optional
--- a/tests/integration_tests/extensions/nodes/giga_switch.py
+++ b/tests/integration_tests/extensions/nodes/giga_switch.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Dict

 from prettytable import MARKDOWN, PrettyTable
--- a/tests/integration_tests/extensions/nodes/super_computer.py
+++ b/tests/integration_tests/extensions/nodes/super_computer.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import ClassVar, Dict

 from primaite.simulator.network.hardware.nodes.host.host_node import HostNode, NIC
--- a/tests/integration_tests/extensions/services/extended_service.py
+++ b/tests/integration_tests/extensions/services/extended_service.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from typing import Any, Dict, List, Literal, Optional, Union
 from uuid import uuid4
--- a/tests/integration_tests/extensions/test_extendable_config.py
+++ b/tests/integration_tests/extensions/test_extendable_config.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import os

 from primaite.config.load import get_extended_config_path
--- a/tests/integration_tests/game_layer/actions/init.py
+++ b/tests/integration_tests/game_layer/actions/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/integration_tests/game_layer/actions/test_application_request_permission.py
+++ b/tests/integration_tests/game_layer/actions/test_application_request_permission.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/game_layer/actions/test_c2_suite_actions.py
+++ b/tests/integration_tests/game_layer/actions/test_c2_suite_actions.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from typing import Tuple

--- a/tests/integration_tests/game_layer/actions/test_configure_actions.py
+++ b/tests/integration_tests/game_layer/actions/test_configure_actions.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address

 import pytest
--- a/tests/integration_tests/game_layer/actions/test_file_request_permission.py
+++ b/tests/integration_tests/game_layer/actions/test_file_request_permission.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import uuid
 from typing import Tuple

--- a/tests/integration_tests/game_layer/actions/test_folder_request_permission.py
+++ b/tests/integration_tests/game_layer/actions/test_folder_request_permission.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import uuid
 from typing import Tuple

--- a/tests/integration_tests/game_layer/actions/test_nic_request_permission.py
+++ b/tests/integration_tests/game_layer/actions/test_nic_request_permission.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/game_layer/actions/test_node_request_permission.py
+++ b/tests/integration_tests/game_layer/actions/test_node_request_permission.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/game_layer/actions/test_service_request_permission.py
+++ b/tests/integration_tests/game_layer/actions/test_service_request_permission.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/game_layer/actions/test_terminal_actions.py
+++ b/tests/integration_tests/game_layer/actions/test_terminal_actions.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/game_layer/observations/init.py
+++ b/tests/integration_tests/game_layer/observations/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/integration_tests/game_layer/observations/test_acl_observations.py
+++ b/tests/integration_tests/game_layer/observations/test_acl_observations.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest

 from primaite.game.agent.observations.acl_observation import ACLObservation
--- a/tests/integration_tests/game_layer/observations/test_file_system_observations.py
+++ b/tests/integration_tests/game_layer/observations/test_file_system_observations.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest
 from gymnasium import spaces

--- a/tests/integration_tests/game_layer/observations/test_firewall_observation.py
+++ b/tests/integration_tests/game_layer/observations/test_firewall_observation.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.game.agent.observations.firewall_observation import FirewallObservation
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
--- a/tests/integration_tests/game_layer/observations/test_link_observations.py
+++ b/tests/integration_tests/game_layer/observations/test_link_observations.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest
 from gymnasium import spaces

--- a/tests/integration_tests/game_layer/observations/test_nic_observations.py
+++ b/tests/integration_tests/game_layer/observations/test_nic_observations.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from pathlib import Path
 from typing import Union

--- a/tests/integration_tests/game_layer/observations/test_node_observations.py
+++ b/tests/integration_tests/game_layer/observations/test_node_observations.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import copy
 from uuid import uuid4

--- a/tests/integration_tests/game_layer/observations/test_router_observation.py
+++ b/tests/integration_tests/game_layer/observations/test_router_observation.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from pprint import pprint

 from primaite.game.agent.observations.acl_observation import ACLObservation
--- a/tests/integration_tests/game_layer/observations/test_software_observations.py
+++ b/tests/integration_tests/game_layer/observations/test_software_observations.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest
 from gymnasium import spaces

--- a/tests/integration_tests/game_layer/observations/test_user_observations.py
+++ b/tests/integration_tests/game_layer/observations/test_user_observations.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest

 from primaite.session.environment import PrimaiteGymEnv
--- a/tests/integration_tests/game_layer/test_RNG_seed.py
+++ b/tests/integration_tests/game_layer/test_RNG_seed.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from pprint import pprint

 import pytest
--- a/tests/integration_tests/game_layer/test_action_mask.py
+++ b/tests/integration_tests/game_layer/test_action_mask.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.session.environment import PrimaiteGymEnv
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
 from primaite.simulator.network.hardware.nodes.host.host_node import HostNode
--- a/tests/integration_tests/game_layer/test_actions.py
+++ b/tests/integration_tests/game_layer/test_actions.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 # Plan for creating integration tests for the actions:
 # I need to test that the requests coming out of the actions have the intended effect on the simulation.
 # I can do this by creating a simulation, and then running the action on the simulation, and then checking
--- a/tests/integration_tests/game_layer/test_observations.py
+++ b/tests/integration_tests/game_layer/test_observations.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from gymnasium import spaces

 from primaite.game.agent.observations.file_system_observations import FileObservation
--- a/tests/integration_tests/game_layer/test_rewards.py
+++ b/tests/integration_tests/game_layer/test_rewards.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest
 import yaml

--- a/tests/integration_tests/network/init.py
+++ b/tests/integration_tests/network/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/integration_tests/network/test_airspace_config.py
+++ b/tests/integration_tests/network/test_airspace_config.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import yaml

 from primaite.game.game import PrimaiteGame
--- a/tests/integration_tests/network/test_bandwidth_load_checks_before_transmission.py
+++ b/tests/integration_tests/network/test_bandwidth_load_checks_before_transmission.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.simulator.file_system.file_type import FileType
 from primaite.simulator.network.hardware.nodes.network.router import ACLAction
 from primaite.simulator.system.services.ftp.ftp_client import FTPClient
--- a/tests/integration_tests/network/test_broadcast.py
+++ b/tests/integration_tests/network/test_broadcast.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address, IPv4Network
 from typing import Any, Dict, List, Tuple

--- a/tests/integration_tests/network/test_capture_nmne.py
+++ b/tests/integration_tests/network/test_capture_nmne.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.game.agent.observations.nic_observations import NICObservation
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.nodes.host.host_node import NIC
--- a/tests/integration_tests/network/test_firewall.py
+++ b/tests/integration_tests/network/test_firewall.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address

 import pytest
--- a/tests/integration_tests/network/test_frame_transmission.py
+++ b/tests/integration_tests/network/test_frame_transmission.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.network.hardware.nodes.host.host_node import NIC
--- a/tests/integration_tests/network/test_multi_lan_internet_example_network.py
+++ b/tests/integration_tests/network/test_multi_lan_internet_example_network.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.network.hardware.nodes.host.server import Server
 from primaite.simulator.network.networks import multi_lan_internet_network_example
--- a/tests/integration_tests/network/test_network_creation.py
+++ b/tests/integration_tests/network/test_network_creation.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.network.hardware.nodes.host.host_node import NIC
--- a/tests/integration_tests/network/test_nic_link_connection.py
+++ b/tests/integration_tests/network/test_nic_link_connection.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest

 from primaite.simulator.network.hardware.base import Link
--- a/tests/integration_tests/network/test_routing.py
+++ b/tests/integration_tests/network/test_routing.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/network/test_switched_network.py
+++ b/tests/integration_tests/network/test_switched_network.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 def test_switched_network(client_switch_server):
    """Tests a node can ping another node via the switch."""
    computer, switch, server = client_switch_server
--- a/tests/integration_tests/network/test_users_creation_from_config.py
+++ b/tests/integration_tests/network/test_users_creation_from_config.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import yaml

 from primaite.game.game import PrimaiteGame
--- a/tests/integration_tests/network/test_wireless_router.py
+++ b/tests/integration_tests/network/test_wireless_router.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pytest
 import yaml

--- a/tests/integration_tests/system/init.py
+++ b/tests/integration_tests/system/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/integration_tests/system/red_applications/test_c2_suite_integration.py
+++ b/tests/integration_tests/system/red_applications/test_c2_suite_integration.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from typing import Tuple

--- a/tests/integration_tests/system/red_applications/test_data_manipulation_bot_and_server.py
+++ b/tests/integration_tests/system/red_applications/test_data_manipulation_bot_and_server.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from typing import Tuple

--- a/tests/integration_tests/system/red_applications/test_dos_bot_and_server.py
+++ b/tests/integration_tests/system/red_applications/test_dos_bot_and_server.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from typing import Tuple

--- a/tests/integration_tests/system/red_applications/test_ransomware_script.py
+++ b/tests/integration_tests/system/red_applications/test_ransomware_script.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from typing import Tuple

--- a/tests/integration_tests/system/test_application_on_node.py
+++ b/tests/integration_tests/system/test_application_on_node.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/system/test_arp.py
+++ b/tests/integration_tests/system/test_arp.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.simulator.network.hardware.nodes.network.router import RouterARP
 from primaite.simulator.system.services.arp.arp import ARP
 from tests.integration_tests.network.test_routing import multi_hop_network
--- a/tests/integration_tests/system/test_database_on_node.py
+++ b/tests/integration_tests/system/test_database_on_node.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from typing import Tuple

--- a/tests/integration_tests/system/test_dns_client_server.py
+++ b/tests/integration_tests/system/test_dns_client_server.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from typing import Tuple

--- a/tests/integration_tests/system/test_ftp_client_server.py
+++ b/tests/integration_tests/system/test_ftp_client_server.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/system/test_nmap.py
+++ b/tests/integration_tests/system/test_nmap.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from enum import Enum
 from ipaddress import IPv4Address, IPv4Network

--- a/tests/integration_tests/system/test_ntp_client_server.py
+++ b/tests/integration_tests/system/test_ntp_client_server.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from time import sleep
 from typing import Tuple
--- a/tests/integration_tests/system/test_service_listening_on_ports.py
+++ b/tests/integration_tests/system/test_service_listening_on_ports.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Any, Dict, List, Set

 import yaml
--- a/tests/integration_tests/system/test_service_on_node.py
+++ b/tests/integration_tests/system/test_service_on_node.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/system/test_user_session_manager_logins.py
+++ b/tests/integration_tests/system/test_user_session_manager_logins.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple
 from uuid import uuid4

--- a/tests/integration_tests/system/test_web_client_server.py
+++ b/tests/integration_tests/system/test_web_client_server.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Tuple

 import pytest
--- a/tests/integration_tests/system/test_web_client_server_and_database.py
+++ b/tests/integration_tests/system/test_web_client_server_and_database.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from ipaddress import IPv4Address
 from typing import Tuple

--- a/tests/integration_tests/test_simulation/init.py
+++ b/tests/integration_tests/test_simulation/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/integration_tests/test_simulation/test_request_response.py
+++ b/tests/integration_tests/test_simulation/test_request_response.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 # some test cases:
 # 0. test that sending a request to a valid target results in a success
 # 1. test that sending a request to a component that doesn't exist results in a failure
--- a/tests/mock_and_patch/init.py
+++ b/tests/mock_and_patch/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/mock_and_patch/get_session_path_mock.py
+++ b/tests/mock_and_patch/get_session_path_mock.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import tempfile
 from datetime import datetime
 from pathlib import Path
--- a/tests/unit_tests/init.py
+++ b/tests/unit_tests/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/unit_tests/_primaite/init.py
+++ b/tests/unit_tests/_primaite/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/unit_tests/_primaite/_game/init.py
+++ b/tests/unit_tests/_primaite/_game/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/unit_tests/_primaite/_game/_agent/init.py
+++ b/tests/unit_tests/_primaite/_game/_agent/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/unit_tests/_primaite/_game/_agent/test_actions.py
+++ b/tests/unit_tests/_primaite/_game/_agent/test_actions.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from unittest.mock import Mock

 import pytest
--- a/tests/unit_tests/_primaite/_game/_agent/test_agent_log.py
+++ b/tests/unit_tests/_primaite/_game/_agent/test_agent_log.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from uuid import uuid4

 import pytest
--- a/Show More
+++ b/Show More