diff --git a/envs/monkey_zoo/blackbox/island_client/island_config_parser.py b/envs/monkey_zoo/blackbox/island_client/test_configuration_parser.py similarity index 91% rename from envs/monkey_zoo/blackbox/island_client/island_config_parser.py rename to envs/monkey_zoo/blackbox/island_client/test_configuration_parser.py index 12f870a91..139d18f24 100644 --- a/envs/monkey_zoo/blackbox/island_client/island_config_parser.py +++ b/envs/monkey_zoo/blackbox/island_client/test_configuration_parser.py @@ -3,7 +3,7 @@ from typing import Iterable from envs.monkey_zoo.blackbox.test_configurations.test_configuration import TestConfiguration -class IslandConfigParser: +class TestConfigurationParser: @staticmethod def get_target_ips(test_configuration: TestConfiguration) -> Iterable[str]: return test_configuration.agent_configuration.propagation.network_scan.targets.subnets diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py index 60b7862f5..9d873a8ed 100644 --- a/envs/monkey_zoo/blackbox/test_blackbox.py +++ b/envs/monkey_zoo/blackbox/test_blackbox.py @@ -7,8 +7,8 @@ import pytest from envs.monkey_zoo.blackbox.analyzers.communication_analyzer import CommunicationAnalyzer from envs.monkey_zoo.blackbox.analyzers.zerologon_analyzer import ZerologonAnalyzer from envs.monkey_zoo.blackbox.gcp_test_machine_list import GCP_TEST_MACHINE_LIST -from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient +from envs.monkey_zoo.blackbox.island_client.test_configuration_parser import TestConfigurationParser from envs.monkey_zoo.blackbox.log_handlers.test_logs_handler import TestLogsHandler from envs.monkey_zoo.blackbox.test_configurations import ( depth_1_a_test_configuration, @@ -91,7 +91,7 @@ class TestMonkeyBlackbox: ): analyzer = CommunicationAnalyzer( island_client, - IslandConfigParser.get_target_ips(test_configuration), + TestConfigurationParser.get_target_ips(test_configuration), ) log_handler = TestLogsHandler( test_name, island_client, TestMonkeyBlackbox.get_log_dir_path() @@ -146,7 +146,7 @@ class TestMonkeyBlackbox: zero_logon_analyzer = ZerologonAnalyzer(island_client, expected_creds) communication_analyzer = CommunicationAnalyzer( island_client, - IslandConfigParser.get_target_ips(zerologon_test_configuration), + TestConfigurationParser.get_target_ips(zerologon_test_configuration), ) log_handler = TestLogsHandler( test_name, island_client, TestMonkeyBlackbox.get_log_dir_path() diff --git a/envs/monkey_zoo/blackbox/tests/exploitation.py b/envs/monkey_zoo/blackbox/tests/exploitation.py index 1c2772bda..f551afaa5 100644 --- a/envs/monkey_zoo/blackbox/tests/exploitation.py +++ b/envs/monkey_zoo/blackbox/tests/exploitation.py @@ -1,7 +1,7 @@ import logging from time import sleep -from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser +from envs.monkey_zoo.blackbox.island_client.test_configuration_parser import TestConfigurationParser from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest from envs.monkey_zoo.blackbox.utils.test_timer import TestTimer @@ -36,7 +36,7 @@ class ExploitationTest(BasicTest): def print_test_starting_info(self): LOGGER.info("Started {} test".format(self.name)) - machine_list = ", ".join(IslandConfigParser.get_target_ips(self.test_configuration)) + machine_list = ", ".join(TestConfigurationParser.get_target_ips(self.test_configuration)) LOGGER.info(f"Machines participating in test: {machine_list}") print("")