Once again fixed isort bug in travis and fixed some imports

.travis.yml

@@ -77,11 +77,12 @@ script:
 - if [ $(tail -n 1 flake8_warnings.txt) -gt $PYTHON_WARNINGS_AMOUNT_UPPER_LIMIT ]; then echo "Too many python linter warnings! Failing this build. Lower the amount of linter errors in this and try again. " && exit 1; fi
 
 ## Check import order
-- python -m isort . -c -p common -p infection_monkey -p monkey_island --skip ./common/cloud/scoutsuite --skip ./monkey_island/cc/services/zero_trust/scoutsuite/data_parsing/rule_path_building/rule_path_creators_list.py -l 120 --wl 120
+- python -m isort . -c -p common -p infection_monkey -p monkey_island --skip ./monkey/common/cloud/scoutsuite --skip ./monkey_island/cc/services/zero_trust/scoutsuite/data_parsing/rule_path_building/rule_path_creators_list.py -l 120 --wl 120
 
 ## Run unit tests
 - cd monkey  # This is our source dir
-- python -m pytest  --ignore=./common/cloud/scoutsuite # Have to use `python -m pytest` instead of `pytest` to add "{$builddir}/monkey/monkey" to sys.path.
+- python -m pytest  --ignore=./monkey/
+  common/cloud/scoutsuite # Have to use `python -m pytest` instead of `pytest` to add "{$builddir}/monkey/monkey" to sys.path.
 
 ## Calculate Code Coverage
 - coverage run -m pytest

envs/monkey_zoo/blackbox/analyzers/performance_analyzer.py

@@ -3,8 +3,7 @@ from datetime import timedelta
 from typing import Dict
 
 from envs.monkey_zoo.blackbox.analyzers.analyzer import Analyzer
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-    PerformanceTestConfig
 
 LOGGER = logging.getLogger(__name__)
 

envs/monkey_zoo/blackbox/island_client/monkey_island_client.py

@@ -4,8 +4,7 @@ from time import sleep
 
 from bson import json_util
 
-from envs.monkey_zoo.blackbox.island_client.monkey_island_requests import \
+from envs.monkey_zoo.blackbox.island_client.monkey_island_requests import MonkeyIslandRequests
-    MonkeyIslandRequests
 
 SLEEP_BETWEEN_REQUESTS_SECONDS = 0.5
 MONKEY_TEST_ENDPOINT = 'api/test/monkey'

envs/monkey_zoo/blackbox/island_client/monkey_island_requests.py

@@ -5,8 +5,7 @@ from typing import Dict
 
 import requests
 
-from envs.monkey_zoo.blackbox.island_client.supported_request_method import \
+from envs.monkey_zoo.blackbox.island_client.supported_request_method import SupportedRequestMethod
-    SupportedRequestMethod
 
 # SHA3-512 of '1234567890!@#$%^&*()_nothing_up_my_sleeve_1234567890!@#$%^&*()'
 NO_AUTH_CREDS = '55e97c9dcfd22b8079189ddaeea9bce8125887e3237b800c6176c9afa80d2062' \

envs/monkey_zoo/blackbox/log_handlers/test_logs_handler.py

@@ -2,10 +2,8 @@ import logging
 import os
 import shutil
 
-from envs.monkey_zoo.blackbox.log_handlers.monkey_log_parser import \
+from envs.monkey_zoo.blackbox.log_handlers.monkey_log_parser import MonkeyLogParser
-    MonkeyLogParser
+from envs.monkey_zoo.blackbox.log_handlers.monkey_logs_downloader import MonkeyLogsDownloader
-from envs.monkey_zoo.blackbox.log_handlers.monkey_logs_downloader import \
-    MonkeyLogsDownloader
 
 LOG_DIR_NAME = 'logs'
 LOGGER = logging.getLogger(__name__)

envs/monkey_zoo/blackbox/test_blackbox.py

@@ -4,25 +4,17 @@ from time import sleep
 
 import pytest
 
-from envs.monkey_zoo.blackbox.analyzers.communication_analyzer import \
+from envs.monkey_zoo.blackbox.analyzers.communication_analyzer import CommunicationAnalyzer
-    CommunicationAnalyzer
+from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser
-from envs.monkey_zoo.blackbox.island_client.island_config_parser import \
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
-    IslandConfigParser
+from envs.monkey_zoo.blackbox.log_handlers.test_logs_handler import TestLogsHandler
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import \
-    MonkeyIslandClient
-from envs.monkey_zoo.blackbox.log_handlers.test_logs_handler import \
-    TestLogsHandler
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
-from envs.monkey_zoo.blackbox.tests.performance.map_generation import \
+from envs.monkey_zoo.blackbox.tests.performance.map_generation import MapGenerationTest
-    MapGenerationTest
+from envs.monkey_zoo.blackbox.tests.performance.map_generation_from_telemetries import MapGenerationFromTelemetryTest
-from envs.monkey_zoo.blackbox.tests.performance.map_generation_from_telemetries import \
+from envs.monkey_zoo.blackbox.tests.performance.report_generation import ReportGenerationTest
-    MapGenerationFromTelemetryTest
-from envs.monkey_zoo.blackbox.tests.performance.report_generation import \
-    ReportGenerationTest
 from envs.monkey_zoo.blackbox.tests.performance.report_generation_from_telemetries import \
     ReportGenerationFromTelemetryTest
-from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import \
+from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import TelemetryPerformanceTest
-    TelemetryPerformanceTest
 from envs.monkey_zoo.blackbox.utils import gcp_machine_handlers
 
 DEFAULT_TIMEOUT_SECONDS = 5*60

envs/monkey_zoo/blackbox/tests/performance/endpoint_performance_test.py

@@ -1,14 +1,10 @@
 import logging
 
-from envs.monkey_zoo.blackbox.analyzers.performance_analyzer import \
+from envs.monkey_zoo.blackbox.analyzers.performance_analyzer import PerformanceAnalyzer
-    PerformanceAnalyzer
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import \
+from envs.monkey_zoo.blackbox.island_client.supported_request_method import SupportedRequestMethod
-    MonkeyIslandClient
-from envs.monkey_zoo.blackbox.island_client.supported_request_method import \
-    SupportedRequestMethod
 from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-    PerformanceTestConfig
 
 LOGGER = logging.getLogger(__name__)
 

envs/monkey_zoo/blackbox/tests/performance/map_generation.py

@@ -1,12 +1,9 @@
 from datetime import timedelta
 
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test import \
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
-    PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_workflow import PerformanceTestWorkflow
-    PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_workflow import \
-    PerformanceTestWorkflow
 
 MAX_ALLOWED_SINGLE_PAGE_TIME = timedelta(seconds=2)
 MAX_ALLOWED_TOTAL_TIME = timedelta(seconds=5)

envs/monkey_zoo/blackbox/tests/performance/map_generation_from_telemetries.py

@@ -1,9 +1,7 @@
 from datetime import timedelta
 
-from envs.monkey_zoo.blackbox.tests.performance.performance_test import \
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
-    PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
-    PerformanceTestConfig
 from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test_workflow import \
     TelemetryPerformanceTestWorkflow
 

envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py

@@ -1,9 +1,7 @@
 from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
-from envs.monkey_zoo.blackbox.tests.performance.endpoint_performance_test import \
+from envs.monkey_zoo.blackbox.tests.performance.endpoint_performance_test import EndpointPerformanceTest
-    EndpointPerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
-    PerformanceTestConfig
 
 
 class PerformanceTestWorkflow(BasicTest):

envs/monkey_zoo/blackbox/tests/performance/report_generation.py

@@ -1,12 +1,9 @@
 from datetime import timedelta
 
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
-from envs.monkey_zoo.blackbox.tests.performance.performance_test import \
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
-    PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_workflow import PerformanceTestWorkflow
-    PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_workflow import \
-    PerformanceTestWorkflow
 
 MAX_ALLOWED_SINGLE_PAGE_TIME = timedelta(seconds=2)
 MAX_ALLOWED_TOTAL_TIME = timedelta(seconds=5)

envs/monkey_zoo/blackbox/tests/performance/report_generation_from_telemetries.py

@@ -1,9 +1,7 @@
 from datetime import timedelta
 
-from envs.monkey_zoo.blackbox.tests.performance.performance_test import \
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
-    PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
-    PerformanceTestConfig
 from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test_workflow import \
     TelemetryPerformanceTestWorkflow
 

envs/monkey_zoo/blackbox/tests/performance/telem_sample_parsing/sample_multiplier/sample_multiplier.py

@@ -6,12 +6,10 @@ from typing import Dict, List
 
 from tqdm import tqdm
 
-from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_file_parser import \
+from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_file_parser import SampleFileParser
-    SampleFileParser
 from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_multiplier.fake_ip_generator import \
     FakeIpGenerator
-from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_multiplier.fake_monkey import \
+from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_multiplier.fake_monkey import FakeMonkey
-    FakeMonkey
 
 TELEM_DIR_PATH = './tests/performance/telemetry_sample'
 LOGGER = logging.getLogger(__name__)

envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test.py

@@ -4,16 +4,11 @@ from datetime import timedelta
 
 from tqdm import tqdm
 
-from envs.monkey_zoo.blackbox.analyzers.performance_analyzer import \
+from envs.monkey_zoo.blackbox.analyzers.performance_analyzer import PerformanceAnalyzer
-    PerformanceAnalyzer
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import \
+from envs.monkey_zoo.blackbox.island_client.supported_request_method import SupportedRequestMethod
-    MonkeyIslandClient
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.island_client.supported_request_method import \
+from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_file_parser import SampleFileParser
-    SupportedRequestMethod
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
-    PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.telem_sample_parsing.sample_file_parser import \
-    SampleFileParser
 
 LOGGER = logging.getLogger(__name__)
 

envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py

@@ -1,10 +1,7 @@
 from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
-from envs.monkey_zoo.blackbox.tests.performance.endpoint_performance_test import \
+from envs.monkey_zoo.blackbox.tests.performance.endpoint_performance_test import EndpointPerformanceTest
-    EndpointPerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import \
+from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import TelemetryPerformanceTest
-    PerformanceTestConfig
-from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import \
-    TelemetryPerformanceTest
 
 
 class TelemetryPerformanceTestWorkflow(BasicTest):

envs/os_compatibility/test_compatibility.py

@@ -1,7 +1,6 @@
 import pytest
 
-from envs.monkey_zoo.blackbox.island_client.monkey_island_client import \
+from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
-    MonkeyIslandClient
 
 machine_list = {
     "10.0.0.36": "centos_6",