#2912 - Merge in changes on target branch

2025-01-03 14:48:18 +00:00
parent ab2dd6ca27 eb91721518
commit e653afaa4c
407 changed files with 664 additions and 671 deletions
--- 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,10 +1,11 @@
-# © 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
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
+from tests import TEST_ASSETS_ROOT
 from tests.integration_tests.configuration_file_parsing import BASIC_CONFIG, DMZ_NETWORK, load_config
 from tests.integration_tests.extensions.applications.extended_application import ExtendedApplication
 from tests.integration_tests.extensions.nodes.giga_switch import GigaSwitch
@@ -13,11 +14,12 @@ from tests.integration_tests.extensions.nodes.giga_switch import GigaSwitch
 from tests.integration_tests.extensions.nodes.super_computer import SuperComputer
 from tests.integration_tests.extensions.services.extended_service import ExtendedService

+CONFIG_PATH = TEST_ASSETS_ROOT / "configs/extended_config.yaml"
+

 def test_extended_example_config():
    """Test that the example config can be parsed properly."""
-    config_path = os.path.join("tests", "assets", "configs", "extended_config.yaml")
-    game = load_config(config_path)
+    game = load_config(CONFIG_PATH)
    network: Network = game.simulation.network

    assert len(network.nodes) == 10  # 10 nodes in example network
--- 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

@@ -18,12 +18,14 @@ from tests import TEST_ASSETS_ROOT
 from tests.conftest import ControlledAgent


-def test_WebpageUnavailablePenalty(game_and_agent):
+def test_WebpageUnavailablePenalty(game_and_agent: tuple[PrimaiteGame, ControlledAgent]):
    """Test that we get the right reward for failing to fetch a website."""
    # set up the scenario, configure the web browser to the correct url
    game, agent = game_and_agent
    agent: ControlledAgent
-    comp = WebpageUnavailablePenalty(node_hostname="client_1")
+    schema = WebpageUnavailablePenalty.ConfigSchema(node_hostname="client_1", sticky=True)
+    comp = WebpageUnavailablePenalty(config=schema)
+
    client_1 = game.simulation.network.get_node_by_hostname("client_1")
    browser: WebBrowser = client_1.software_manager.software.get("WebBrowser")
    browser.run()
@@ -53,7 +55,7 @@ def test_WebpageUnavailablePenalty(game_and_agent):
    assert agent.reward_function.current_reward == -0.7


-def test_uc2_rewards(game_and_agent):
+def test_uc2_rewards(game_and_agent: tuple[PrimaiteGame, ControlledAgent]):
    """Test that the reward component correctly applies a penalty when the selected client cannot reach the database."""
    game, agent = game_and_agent
    agent: ControlledAgent
@@ -74,7 +76,8 @@ def test_uc2_rewards(game_and_agent):
        ACLAction.PERMIT, src_port=PORT_LOOKUP["POSTGRES_SERVER"], dst_port=PORT_LOOKUP["POSTGRES_SERVER"], position=2
    )

-    comp = GreenAdminDatabaseUnreachablePenalty("client_1")
+    schema = GreenAdminDatabaseUnreachablePenalty.ConfigSchema(node_hostname="client_1", sticky=True)
+    comp = GreenAdminDatabaseUnreachablePenalty(config=schema)

    request = ["network", "node", "client_1", "application", "DatabaseClient", "execute"]
    response = game.simulation.apply_request(request)
@@ -139,15 +142,17 @@ def test_action_penalty_loads_from_config():
            act_penalty_obj = comp[0]
    if act_penalty_obj is None:
        pytest.fail("Action penalty reward component was not added to the agent from config.")
-    assert act_penalty_obj.action_penalty == -0.75
-    assert act_penalty_obj.do_nothing_penalty == 0.125
+    assert act_penalty_obj.config.action_penalty == -0.75
+    assert act_penalty_obj.config.do_nothing_penalty == 0.125


 def test_action_penalty():
    """Test that the action penalty is correctly applied when agent performs any action"""

    # Create an ActionPenalty Reward
-    Penalty = ActionPenalty(action_penalty=-0.75, do_nothing_penalty=0.125)
+    schema = ActionPenalty.ConfigSchema(action_penalty=-0.75, do_nothing_penalty=0.125)
+    # Penalty = ActionPenalty(action_penalty=-0.75, do_nothing_penalty=0.125)
+    Penalty = ActionPenalty(config=schema)

    # Assert that penalty is applied if action isn't do_nothing
    reward_value = Penalty.calculate(
@@ -178,11 +183,12 @@ def test_action_penalty():
    assert reward_value == 0.125


-def test_action_penalty_e2e(game_and_agent):
+def test_action_penalty_e2e(game_and_agent: tuple[PrimaiteGame, ControlledAgent]):
    """Test that we get the right reward for doing actions to fetch a website."""
    game, agent = game_and_agent
    agent: ControlledAgent
-    comp = ActionPenalty(action_penalty=-0.75, do_nothing_penalty=0.125)
+    schema = ActionPenalty.ConfigSchema(action_penalty=-0.75, do_nothing_penalty=0.125)
+    comp = ActionPenalty(config=schema)

    agent.reward_function.register_component(comp, 1.0)

--- 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