From 86c4f9f63d36910f0eb17d82b81a2fdac932c3fc Mon Sep 17 00:00:00 2001 From: Shreya Date: Wed, 14 Apr 2021 10:42:04 +0530 Subject: [PATCH] Rename directory "test" to "blackbox" in monkey_island/cc/resources/ --- monkey/monkey_island/cc/app.py | 8 ++++---- .../cc/resources/{test => blackbox}/__init__.py | 0 .../cc/resources/{test => blackbox}/clear_caches.py | 0 .../cc/resources/{test => blackbox}/log_test_endpoint.py | 0 .../resources/{test => blackbox}/monkey_test_endpoint.py | 0 .../{test => blackbox}/telemetry_test_endpoint.py | 0 .../cc/resources/{test => blackbox}/utils/telem_store.py | 0 monkey/monkey_island/cc/resources/log.py | 2 +- monkey/monkey_island/cc/resources/monkey.py | 2 +- monkey/monkey_island/cc/resources/telemetry.py | 2 +- monkey/monkey_island/cc/services/infection_lifecycle.py | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename monkey/monkey_island/cc/resources/{test => blackbox}/__init__.py (100%) rename monkey/monkey_island/cc/resources/{test => blackbox}/clear_caches.py (100%) rename monkey/monkey_island/cc/resources/{test => blackbox}/log_test_endpoint.py (100%) rename monkey/monkey_island/cc/resources/{test => blackbox}/monkey_test_endpoint.py (100%) rename monkey/monkey_island/cc/resources/{test => blackbox}/telemetry_test_endpoint.py (100%) rename monkey/monkey_island/cc/resources/{test => blackbox}/utils/telem_store.py (100%) diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py index 4cc37e269..564898845 100644 --- a/monkey/monkey_island/cc/app.py +++ b/monkey/monkey_island/cc/app.py @@ -12,6 +12,10 @@ from monkey_island.cc.resources.attack.attack_config import AttackConfiguration from monkey_island.cc.resources.attack.attack_report import AttackReport from monkey_island.cc.resources.auth.auth import Authenticate, init_jwt from monkey_island.cc.resources.auth.registration import Registration +from monkey_island.cc.resources.blackbox.clear_caches import ClearCaches +from monkey_island.cc.resources.blackbox.log_test_endpoint import LogTestEndpoint +from monkey_island.cc.resources.blackbox.monkey_test_endpoint import MonkeyTestEndpoint +from monkey_island.cc.resources.blackbox.telemetry_test_endpoint import TelemetryTestEndpoint from monkey_island.cc.resources.bootloader import Bootloader from monkey_island.cc.resources.client_run import ClientRun from monkey_island.cc.resources.edge import Edge @@ -36,10 +40,6 @@ from monkey_island.cc.resources.security_report import SecurityReport from monkey_island.cc.resources.T1216_pba_file_download import T1216PBAFileDownload from monkey_island.cc.resources.telemetry import Telemetry from monkey_island.cc.resources.telemetry_feed import TelemetryFeed -from monkey_island.cc.resources.test.clear_caches import ClearCaches -from monkey_island.cc.resources.test.log_test_endpoint import LogTestEndpoint -from monkey_island.cc.resources.test.monkey_test_endpoint import MonkeyTestEndpoint -from monkey_island.cc.resources.test.telemetry_test_endpoint import TelemetryTestEndpoint from monkey_island.cc.resources.version_update import VersionUpdate from monkey_island.cc.resources.zero_trust.finding_event import ZeroTrustFindingEvent from monkey_island.cc.resources.zero_trust.scoutsuite_auth.aws_keys import AWSKeys diff --git a/monkey/monkey_island/cc/resources/test/__init__.py b/monkey/monkey_island/cc/resources/blackbox/__init__.py similarity index 100% rename from monkey/monkey_island/cc/resources/test/__init__.py rename to monkey/monkey_island/cc/resources/blackbox/__init__.py diff --git a/monkey/monkey_island/cc/resources/test/clear_caches.py b/monkey/monkey_island/cc/resources/blackbox/clear_caches.py similarity index 100% rename from monkey/monkey_island/cc/resources/test/clear_caches.py rename to monkey/monkey_island/cc/resources/blackbox/clear_caches.py diff --git a/monkey/monkey_island/cc/resources/test/log_test_endpoint.py b/monkey/monkey_island/cc/resources/blackbox/log_test_endpoint.py similarity index 100% rename from monkey/monkey_island/cc/resources/test/log_test_endpoint.py rename to monkey/monkey_island/cc/resources/blackbox/log_test_endpoint.py diff --git a/monkey/monkey_island/cc/resources/test/monkey_test_endpoint.py b/monkey/monkey_island/cc/resources/blackbox/monkey_test_endpoint.py similarity index 100% rename from monkey/monkey_island/cc/resources/test/monkey_test_endpoint.py rename to monkey/monkey_island/cc/resources/blackbox/monkey_test_endpoint.py diff --git a/monkey/monkey_island/cc/resources/test/telemetry_test_endpoint.py b/monkey/monkey_island/cc/resources/blackbox/telemetry_test_endpoint.py similarity index 100% rename from monkey/monkey_island/cc/resources/test/telemetry_test_endpoint.py rename to monkey/monkey_island/cc/resources/blackbox/telemetry_test_endpoint.py diff --git a/monkey/monkey_island/cc/resources/test/utils/telem_store.py b/monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py similarity index 100% rename from monkey/monkey_island/cc/resources/test/utils/telem_store.py rename to monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py diff --git a/monkey/monkey_island/cc/resources/log.py b/monkey/monkey_island/cc/resources/log.py index aae23fed3..126e1f697 100644 --- a/monkey/monkey_island/cc/resources/log.py +++ b/monkey/monkey_island/cc/resources/log.py @@ -6,7 +6,7 @@ from flask import request from monkey_island.cc.database import mongo from monkey_island.cc.resources.auth.auth import jwt_required -from monkey_island.cc.resources.test.utils.telem_store import TestTelemStore +from monkey_island.cc.resources.blackbox.utils.telem_store import TestTelemStore from monkey_island.cc.services.log import LogService from monkey_island.cc.services.node import NodeService diff --git a/monkey/monkey_island/cc/resources/monkey.py b/monkey/monkey_island/cc/resources/monkey.py index 66dbd881a..7d8a18a98 100644 --- a/monkey/monkey_island/cc/resources/monkey.py +++ b/monkey/monkey_island/cc/resources/monkey.py @@ -7,7 +7,7 @@ from flask import request from monkey_island.cc.database import mongo from monkey_island.cc.models.monkey_ttl import create_monkey_ttl_document -from monkey_island.cc.resources.test.utils.telem_store import TestTelemStore +from monkey_island.cc.resources.blackbox.utils.telem_store import TestTelemStore from monkey_island.cc.server_utils.consts import DEFAULT_MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS from monkey_island.cc.services.config import ConfigService from monkey_island.cc.services.edge.edge import EdgeService diff --git a/monkey/monkey_island/cc/resources/telemetry.py b/monkey/monkey_island/cc/resources/telemetry.py index 9bf2f7dda..15e7139a0 100644 --- a/monkey/monkey_island/cc/resources/telemetry.py +++ b/monkey/monkey_island/cc/resources/telemetry.py @@ -10,7 +10,7 @@ from common.common_consts.telem_categories import TelemCategoryEnum from monkey_island.cc.database import mongo from monkey_island.cc.models.monkey import Monkey from monkey_island.cc.resources.auth.auth import jwt_required -from monkey_island.cc.resources.test.utils.telem_store import TestTelemStore +from monkey_island.cc.resources.blackbox.utils.telem_store import TestTelemStore from monkey_island.cc.services.node import NodeService from monkey_island.cc.services.telemetry.processing.processing import process_telemetry diff --git a/monkey/monkey_island/cc/services/infection_lifecycle.py b/monkey/monkey_island/cc/services/infection_lifecycle.py index e921adc3e..476bc2a0e 100644 --- a/monkey/monkey_island/cc/services/infection_lifecycle.py +++ b/monkey/monkey_island/cc/services/infection_lifecycle.py @@ -4,7 +4,7 @@ from datetime import datetime from flask import jsonify from monkey_island.cc.database import mongo -from monkey_island.cc.resources.test.utils.telem_store import TestTelemStore +from monkey_island.cc.resources.blackbox.utils.telem_store import TestTelemStore from monkey_island.cc.services.config import ConfigService from monkey_island.cc.services.node import NodeService from monkey_island.cc.services.reporting.report import ReportService