p15693087
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Island: Move MachineID to common

This commit is contained in:
Mike Salvatore 2022-09-14 12:53:42 -04:00
parent 99b0f5bcd6
commit 1b2b316e1f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
monkey/common/types.py
View File

@ -5,3 +5,4 @@ from typing_extensions import TypeAlias
AgentID: TypeAlias = UUID AgentID: TypeAlias = UUID
HardwareID: TypeAlias = PositiveInt HardwareID: TypeAlias = PositiveInt
MachineID: TypeAlias = PositiveInt

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

@ -9,7 +9,8 @@ from .pba_results import PbaResults
from monkey_island.cc.models.report.report import Report from monkey_island.cc.models.report.report import Report
from .simulation import Simulation, IslandMode from .simulation import Simulation, IslandMode
from .user_credentials import UserCredentials from .user_credentials import UserCredentials
from .machine import Machine, MachineID from common.types import MachineID
from .machine import Machine
from .communication_type import CommunicationType from .communication_type import CommunicationType
from .node import Node from .node import Node
from common.types import AgentID from common.types import AgentID

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

@ -1,15 +1,14 @@
from ipaddress import IPv4Interface from ipaddress import IPv4Interface
from typing import Optional, Sequence from typing import Optional, Sequence
from pydantic import Field, PositiveInt, validator from pydantic import Field, validator
from typing_extensions import TypeAlias
from common import OperatingSystem from common import OperatingSystem
from common.base_models import MutableInfectionMonkeyBaseModel from common.base_models import MutableInfectionMonkeyBaseModel
from common.transforms import make_immutable_sequence from common.transforms import make_immutable_sequence
from common.types import HardwareID from common.types import HardwareID
MachineID: TypeAlias = PositiveInt from . import MachineID
class Machine(MutableInfectionMonkeyBaseModel): class Machine(MutableInfectionMonkeyBaseModel):