Agent: Move PluginType to the i_plugin package

monkey/infection_monkey/i_puppet/__init__.py

@@ -1,3 +1,4 @@
+from .plugin_type import PluginType
 from .i_puppet import (
     IPuppet,
     ExploiterResultData,

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):

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"

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.i_puppet import PluginType, UnknownPluginError
-from infection_monkey.puppet.plugin_type import PluginType
 
 logger = logging.getLogger()
 

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()
 

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