From 296f4e55dff04fa84402b303a3f2dc34c3c16f8f Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Fri, 23 Sep 2022 17:07:15 +0200 Subject: [PATCH] Common, Island: Move AgentSignals model to Common --- monkey/common/__init__.py | 1 + monkey/{monkey_island/cc/models => common}/agent_signals.py | 2 +- monkey/monkey_island/cc/models/__init__.py | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename monkey/{monkey_island/cc/models => common}/agent_signals.py (71%) diff --git a/monkey/common/__init__.py b/monkey/common/__init__.py index 4898b2df8..69190bce5 100644 --- a/monkey/common/__init__.py +++ b/monkey/common/__init__.py @@ -7,3 +7,4 @@ from .operating_system import OperatingSystem from . import types from . import base_models from .agent_registration_data import AgentRegistrationData +from .agent_signals import AgentSignals diff --git a/monkey/monkey_island/cc/models/agent_signals.py b/monkey/common/agent_signals.py similarity index 71% rename from monkey/monkey_island/cc/models/agent_signals.py rename to monkey/common/agent_signals.py index 37af7b4c1..c351e8823 100644 --- a/monkey/monkey_island/cc/models/agent_signals.py +++ b/monkey/common/agent_signals.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import Optional -from common.base_models import InfectionMonkeyBaseModel +from .base_models import InfectionMonkeyBaseModel class AgentSignals(InfectionMonkeyBaseModel): diff --git a/monkey/monkey_island/cc/models/__init__.py b/monkey/monkey_island/cc/models/__init__.py index ca4078faa..65e63fe14 100644 --- a/monkey/monkey_island/cc/models/__init__.py +++ b/monkey/monkey_island/cc/models/__init__.py @@ -15,4 +15,3 @@ from .communication_type import CommunicationType from .node import Node from common.types import AgentID from .agent import Agent -from .agent_signals import AgentSignals