diff --git a/monkey/infection_monkey/i_puppet/__init__.py b/monkey/infection_monkey/i_puppet/__init__.py index 7140b9082..0ba1096d1 100644 --- a/monkey/infection_monkey/i_puppet/__init__.py +++ b/monkey/infection_monkey/i_puppet/__init__.py @@ -1,3 +1,4 @@ +from .plugin_type import PluginType from .i_puppet import ( IPuppet, ExploiterResultData, diff --git a/monkey/infection_monkey/i_puppet/i_puppet.py b/monkey/infection_monkey/i_puppet/i_puppet.py index f3567ee77..3fa2aabd9 100644 --- a/monkey/infection_monkey/i_puppet/i_puppet.py +++ b/monkey/infection_monkey/i_puppet/i_puppet.py @@ -4,7 +4,7 @@ from collections import namedtuple from enum import Enum from typing import Dict -from infection_monkey.puppet.plugin_type import PluginType +from . import PluginType class PortStatus(Enum): diff --git a/monkey/infection_monkey/puppet/plugin_type.py b/monkey/infection_monkey/i_puppet/plugin_type.py similarity index 100% rename from monkey/infection_monkey/puppet/plugin_type.py rename to monkey/infection_monkey/i_puppet/plugin_type.py diff --git a/monkey/infection_monkey/puppet/mock_puppet.py b/monkey/infection_monkey/puppet/mock_puppet.py index 59539c58b..182ebe55e 100644 --- a/monkey/infection_monkey/puppet/mock_puppet.py +++ b/monkey/infection_monkey/puppet/mock_puppet.py @@ -7,11 +7,11 @@ from infection_monkey.i_puppet import ( FingerprintData, IPuppet, PingScanData, + PluginType, PortScanData, PortStatus, PostBreachData, ) -from infection_monkey.puppet.plugin_type import PluginType DOT_1 = "10.0.0.1" DOT_2 = "10.0.0.2" diff --git a/monkey/infection_monkey/puppet/plugin_registry.py b/monkey/infection_monkey/puppet/plugin_registry.py index 76d0d3714..0e98ba2ef 100644 --- a/monkey/infection_monkey/puppet/plugin_registry.py +++ b/monkey/infection_monkey/puppet/plugin_registry.py @@ -1,8 +1,7 @@ import logging from typing import Optional -from infection_monkey.i_puppet import UnknownPluginError -from infection_monkey.puppet.plugin_type import PluginType +from infection_monkey.i_puppet import PluginType, UnknownPluginError logger = logging.getLogger() diff --git a/monkey/infection_monkey/puppet/puppet.py b/monkey/infection_monkey/puppet/puppet.py index 132898536..64a8028e3 100644 --- a/monkey/infection_monkey/puppet/puppet.py +++ b/monkey/infection_monkey/puppet/puppet.py @@ -7,11 +7,11 @@ from infection_monkey.i_puppet import ( FingerprintData, IPuppet, PingScanData, + PluginType, PortScanData, PostBreachData, ) from infection_monkey.puppet.plugin_registry import PluginRegistry -from infection_monkey.puppet.plugin_type import PluginType logger = logging.getLogger() diff --git a/monkey/tests/unit_tests/infection_monkey/puppet/test_puppet.py b/monkey/tests/unit_tests/infection_monkey/puppet/test_puppet.py index c0c4a1f19..950bc329b 100644 --- a/monkey/tests/unit_tests/infection_monkey/puppet/test_puppet.py +++ b/monkey/tests/unit_tests/infection_monkey/puppet/test_puppet.py @@ -1,7 +1,7 @@ import threading from unittest.mock import MagicMock -from infection_monkey.puppet.plugin_type import PluginType +from infection_monkey.i_puppet import PluginType from infection_monkey.puppet.puppet import Puppet