p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Common: Move base_models.py to common

This commit is contained in:
Mike Salvatore 2022-08-22 11:19:15 -04:00
parent acc158db44
commit 3a94be8766
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
monkey/common/__init__.py
View File

@ -4,3 +4,4 @@ Used for a common things between agent and island
from .di_container import DIContainer, UnresolvableDependencyError from .di_container import DIContainer, UnresolvableDependencyError
from .operating_system import OperatingSystem from .operating_system import OperatingSystem
from . import types from . import types
from . import base_models

0
monkey/monkey_island/cc/models/base_models.py → monkey/common/base_models.py
View File

3
monkey/monkey_island/cc/models/agent.py
View File

@ -4,8 +4,9 @@ from uuid import UUID
from pydantic import Field from pydantic import Field
from common.base_models import MutableBaseModel
from . import MachineID from . import MachineID
from .base_models import MutableBaseModel
class Agent(MutableBaseModel): class Agent(MutableBaseModel):

2
monkey/monkey_island/cc/models/machine.py
View File

@ -4,9 +4,9 @@ from typing import Optional, Sequence
from pydantic import Field, PositiveInt, validator from pydantic import Field, PositiveInt, validator
from common import OperatingSystem from common import OperatingSystem
from common.base_models import MutableBaseModel
from common.types import HardwareID from common.types import HardwareID
from .base_models import MutableBaseModel
from .transforms import make_immutable_sequence from .transforms import make_immutable_sequence
MachineID = PositiveInt MachineID = PositiveInt

3
monkey/monkey_island/cc/models/node.py
View File

@ -2,8 +2,9 @@ from typing import Sequence, Tuple
from pydantic import Field, validator from pydantic import Field, validator
from common.base_models import MutableBaseModel
from . import CommunicationType, MachineID from . import CommunicationType, MachineID
from .base_models import MutableBaseModel
from .transforms import make_immutable_nested_sequence from .transforms import make_immutable_nested_sequence
ConnectionsSequence = Sequence[Tuple[MachineID, Sequence[CommunicationType]]] ConnectionsSequence = Sequence[Tuple[MachineID, Sequence[CommunicationType]]]