Merge remote-tracking branch 'origin/dev' into feature/901-change-functionality-acl-rules

tests/__init__.py

@@ -1,4 +1,4 @@
-# Crown Copyright (C) Dstl 2022. DEFCON 703. Shared in confidence.
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 from pathlib import Path
 from typing import Final
 

tests/config/legacy_conversion/legacy_training_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Main Config File
 
 # Generic config values

tests/config/legacy_conversion/new_training_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Main Config File
 
 # Generic config values

tests/config/obs_tests/laydown.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 - item_type: PORTS
   ports_list:
     - port: '80'

tests/config/obs_tests/main_config_LINK_TRAFFIC_LEVELS.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/obs_tests/main_config_NODE_LINK_TABLE.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/obs_tests/main_config_NODE_STATUSES.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/obs_tests/main_config_without_obs.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/one_node_states_on_off_lay_down_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 - item_type: PORTS
   ports_list:
   - port: '21'

tests/config/one_node_states_on_off_main_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/ppo_not_seeded_training_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/ppo_seeded_training_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/single_action_space_fixed_blue_actions_main_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/single_action_space_lay_down_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 - item_type: PORTS
   ports_list:
   - port: '80'

tests/config/single_action_space_main_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/test_random_red_main_config.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/train_episode_step.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/config/training_config_main_rllib.yaml

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 # Training Config File
 
 # Sets which agent algorithm framework will be used.

tests/conftest.py

@@ -1,4 +1,4 @@
-# Crown Copyright (C) Dstl 2022. DEFCON 703. Shared in confidence.
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import datetime
 import json
 import shutil

tests/mock_and_patch/__init__.py

@@ -0,0 +1 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.

tests/mock_and_patch/get_session_path_mock.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import tempfile
 from datetime import datetime
 from pathlib import Path

tests/test_acl.py

@@ -1,4 +1,4 @@
-# Crown Copyright (C) Dstl 2022. DEFCON 703. Shared in confidence.
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 """Used to tes the ACL functions."""
 
 from primaite.acl.access_control_list import AccessControlList

tests/test_active_node.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 """Used to test Active Node functions."""
 import pytest
 

tests/test_observation_space.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 """Test env creation and behaviour with different observation spaces."""
 
 import numpy as np

tests/test_primaite_session.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import os
 
 import pytest

tests/test_red_random_agent_behaviour.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import pytest
 
 from primaite.config.lay_down_config import data_manipulation_config_path

tests/test_resetting_node.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 """Used to test Active Node functions."""
 import pytest
 

tests/test_reward.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import pytest
 
 from primaite import getLogger

tests/test_rllib_agent.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import pytest
 
 from primaite import getLogger

tests/test_seeding_and_deterministic_session.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import pytest as pytest
 
 from primaite.config.lay_down_config import dos_very_basic_config_path

tests/test_service_node.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 """Used to test Service Node functions."""
 import pytest
 

tests/test_session_loading.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import os.path
 import shutil
 import tempfile
@@ -5,6 +6,8 @@ from pathlib import Path
 from typing import Union
 from uuid import uuid4
 
+import pytest
+
 from primaite import getLogger
 from primaite.agents.sb3 import SB3Agent
 from primaite.common.enums import AgentFramework, AgentIdentifier
@@ -96,6 +99,7 @@ def test_load_sb3_session():
     shutil.rmtree(test_path)
 
 
+@pytest.mark.xfail(reason="Temporarily don't worry about this not working")
 def test_load_primaite_session():
     """Test that loading a Primaite session works."""
     expected_learn_mean_reward_per_episode = {
@@ -156,6 +160,7 @@ def test_load_primaite_session():
     shutil.rmtree(test_path)
 
 
+@pytest.mark.xfail(reason="Temporarily don't worry about this not working")
 def test_run_loading():
     """Test loading session via main.run."""
     expected_learn_mean_reward_per_episode = {

tests/test_single_action_space.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import time
 
 import pytest

tests/test_train_eval_episode_steps.py

@@ -1,3 +1,4 @@
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import pytest
 
 from primaite import getLogger

tests/test_training_config.py

@@ -1,4 +1,4 @@
-# Crown Copyright (C) Dstl 2022. DEFCON 703. Shared in confidence.
+# Crown Owned Copyright (C) Dstl 2023. DEFCON 703. Shared in confidence.
 import yaml
 
 from primaite.config import training_config