diff --git a/src/primaite/cli.py b/src/primaite/cli.py index bc4aad39..a5b3be46 100644 --- a/src/primaite/cli.py +++ b/src/primaite/cli.py @@ -29,7 +29,7 @@ def reset_notebooks(overwrite: bool = True) -> None: :param overwrite: If True, will overwrite existing demo notebooks. """ - from src.primaite.setup import reset_demo_notebooks + from primaite.setup import reset_demo_notebooks reset_demo_notebooks.run(overwrite) @@ -98,7 +98,7 @@ def setup(overwrite_existing: bool = True) -> None: from arcd_gate.cli import setup as gate_setup from primaite import getLogger - from src.primaite.setup import reset_demo_notebooks, reset_example_configs + from primaite.setup import reset_demo_notebooks, reset_example_configs _LOGGER = getLogger(__name__) @@ -133,9 +133,9 @@ def session( """ from threading import Thread - from src.primaite.config.load import example_config_path - from src.primaite.main import run - from src.primaite.utils.start_gate_server import start_gate_server + from primaite.config.load import example_config_path + from primaite.main import run + from primaite.utils.start_gate_server import start_gate_server server_thread = Thread(target=start_gate_server) server_thread.start() diff --git a/src/primaite/game/agent/GATE_agents.py b/src/primaite/game/agent/GATE_agents.py index ad52edfc..e50d7831 100644 --- a/src/primaite/game/agent/GATE_agents.py +++ b/src/primaite/game/agent/GATE_agents.py @@ -3,10 +3,10 @@ from typing import Dict, Optional, Tuple from gymnasium.core import ActType, ObsType -from src.primaite.game.agent.actions import ActionManager -from src.primaite.game.agent.interface import AbstractGATEAgent, ObsType -from src.primaite.game.agent.observations import ObservationSpace -from src.primaite.game.agent.rewards import RewardFunction +from primaite.game.agent.actions import ActionManager +from primaite.game.agent.interface import AbstractGATEAgent, ObsType +from primaite.game.agent.observations import ObservationSpace +from primaite.game.agent.rewards import RewardFunction class GATERLAgent(AbstractGATEAgent): diff --git a/src/primaite/game/agent/actions.py b/src/primaite/game/agent/actions.py index 9daa09ee..b06013cd 100644 --- a/src/primaite/game/agent/actions.py +++ b/src/primaite/game/agent/actions.py @@ -15,12 +15,12 @@ from typing import Dict, List, Optional, Tuple, TYPE_CHECKING from gymnasium import spaces from primaite import getLogger -from src.primaite.simulator.sim_container import Simulation +from primaite.simulator.sim_container import Simulation _LOGGER = getLogger(__name__) if TYPE_CHECKING: - from src.primaite.game.session import PrimaiteSession + from primaite.game.session import PrimaiteSession class AbstractAction(ABC): diff --git a/src/primaite/game/agent/interface.py b/src/primaite/game/agent/interface.py index affed19c..89f27f3f 100644 --- a/src/primaite/game/agent/interface.py +++ b/src/primaite/game/agent/interface.py @@ -4,9 +4,9 @@ from typing import Dict, List, Optional, Tuple, TypeAlias, Union import numpy as np -from src.primaite.game.agent.actions import ActionManager -from src.primaite.game.agent.observations import ObservationSpace -from src.primaite.game.agent.rewards import RewardFunction +from primaite.game.agent.actions import ActionManager +from primaite.game.agent.observations import ObservationSpace +from primaite.game.agent.rewards import RewardFunction ObsType: TypeAlias = Union[Dict, np.ndarray] diff --git a/src/primaite/game/agent/observations.py b/src/primaite/game/agent/observations.py index fe43afb2..a3bafeea 100644 --- a/src/primaite/game/agent/observations.py +++ b/src/primaite/game/agent/observations.py @@ -5,12 +5,12 @@ from typing import Any, Dict, List, Optional, Tuple, TYPE_CHECKING from gymnasium import spaces from primaite import getLogger -from src.primaite.game.agent.utils import access_from_nested_dict, NOT_PRESENT_IN_STATE +from primaite.game.agent.utils import access_from_nested_dict, NOT_PRESENT_IN_STATE _LOGGER = getLogger(__name__) if TYPE_CHECKING: - from src.primaite.game.session import PrimaiteSession + from primaite.game.session import PrimaiteSession class AbstractObservation(ABC): diff --git a/src/primaite/game/agent/rewards.py b/src/primaite/game/agent/rewards.py index 72a39fee..6c408ff9 100644 --- a/src/primaite/game/agent/rewards.py +++ b/src/primaite/game/agent/rewards.py @@ -29,12 +29,12 @@ from abc import abstractmethod from typing import Dict, List, Tuple, TYPE_CHECKING from primaite import getLogger -from src.primaite.game.agent.utils import access_from_nested_dict, NOT_PRESENT_IN_STATE +from primaite.game.agent.utils import access_from_nested_dict, NOT_PRESENT_IN_STATE _LOGGER = getLogger(__name__) if TYPE_CHECKING: - from src.primaite.game.session import PrimaiteSession + from primaite.game.session import PrimaiteSession class AbstractReward: diff --git a/src/primaite/game/agent/scripted_agents.py b/src/primaite/game/agent/scripted_agents.py index aa1faefc..3748494b 100644 --- a/src/primaite/game/agent/scripted_agents.py +++ b/src/primaite/game/agent/scripted_agents.py @@ -1,5 +1,5 @@ """Agents with predefined behaviours.""" -from src.primaite.game.agent.interface import AbstractScriptedAgent +from primaite.game.agent.interface import AbstractScriptedAgent class GreenWebBrowsingAgent(AbstractScriptedAgent): diff --git a/src/primaite/game/session.py b/src/primaite/game/session.py index e791a0b9..d40d0754 100644 --- a/src/primaite/game/session.py +++ b/src/primaite/game/session.py @@ -9,27 +9,27 @@ from gymnasium.spaces.utils import flatten, flatten_space from pydantic import BaseModel from primaite import getLogger -from src.primaite.game.agent.actions import ActionManager -from src.primaite.game.agent.interface import AbstractAgent, RandomAgent -from src.primaite.game.agent.observations import ObservationSpace -from src.primaite.game.agent.rewards import RewardFunction -from src.primaite.simulator.network.hardware.base import Link, NIC, Node -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.router import ACLAction, Router -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.network.hardware.nodes.switch import Switch -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.sim_container import Simulation -from src.primaite.simulator.system.applications.application import Application -from src.primaite.simulator.system.applications.database_client import DatabaseClient -from src.primaite.simulator.system.applications.web_browser import WebBrowser -from src.primaite.simulator.system.services.database.database_service import DatabaseService -from src.primaite.simulator.system.services.dns.dns_client import DNSClient -from src.primaite.simulator.system.services.dns.dns_server import DNSServer -from src.primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot -from src.primaite.simulator.system.services.service import Service -from src.primaite.simulator.system.services.web_server.web_server import WebServer +from primaite.game.agent.actions import ActionManager +from primaite.game.agent.interface import AbstractAgent, RandomAgent +from primaite.game.agent.observations import ObservationSpace +from primaite.game.agent.rewards import RewardFunction +from primaite.simulator.network.hardware.base import Link, NIC, Node +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.router import ACLAction, Router +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.network.hardware.nodes.switch import Switch +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.sim_container import Simulation +from primaite.simulator.system.applications.application import Application +from primaite.simulator.system.applications.database_client import DatabaseClient +from primaite.simulator.system.applications.web_browser import WebBrowser +from primaite.simulator.system.services.database.database_service import DatabaseService +from primaite.simulator.system.services.dns.dns_client import DNSClient +from primaite.simulator.system.services.dns.dns_server import DNSServer +from primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot +from primaite.simulator.system.services.service import Service +from primaite.simulator.system.services.web_server.web_server import WebServer _LOGGER = getLogger(__name__) diff --git a/src/primaite/main.py b/src/primaite/main.py index 9f84598c..831419d4 100644 --- a/src/primaite/main.py +++ b/src/primaite/main.py @@ -5,10 +5,10 @@ from pathlib import Path from typing import Optional, Union from primaite import getLogger -from src.primaite.config.load import load -from src.primaite.game.session import PrimaiteSession +from primaite.config.load import load +from primaite.game.session import PrimaiteSession -# from src.primaite.primaite_session import PrimaiteSession +# from primaite.primaite_session import PrimaiteSession _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/domain/account.py b/src/primaite/simulator/domain/account.py index c7b06ff2..d235c00e 100644 --- a/src/primaite/simulator/domain/account.py +++ b/src/primaite/simulator/domain/account.py @@ -3,7 +3,7 @@ from enum import Enum from typing import Dict from primaite import getLogger -from src.primaite.simulator.core import SimComponent +from primaite.simulator.core import SimComponent _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/domain/controller.py b/src/primaite/simulator/domain/controller.py index aac9010b..e9f3b26d 100644 --- a/src/primaite/simulator/domain/controller.py +++ b/src/primaite/simulator/domain/controller.py @@ -1,8 +1,8 @@ from enum import Enum from typing import Dict, Final, List, Literal, Tuple -from src.primaite.simulator.core import RequestManager, RequestPermissionValidator, RequestType, SimComponent -from src.primaite.simulator.domain.account import Account, AccountType +from primaite.simulator.core import RequestManager, RequestPermissionValidator, RequestType, SimComponent +from primaite.simulator.domain.account import Account, AccountType # placeholder while these objects don't yet exist diff --git a/src/primaite/simulator/file_system/file.py b/src/primaite/simulator/file_system/file.py index baa70667..d9b02e8e 100644 --- a/src/primaite/simulator/file_system/file.py +++ b/src/primaite/simulator/file_system/file.py @@ -7,8 +7,8 @@ from pathlib import Path from typing import Dict, Optional from primaite import getLogger -from src.primaite.simulator.file_system.file_system_item_abc import FileSystemItemABC, FileSystemItemHealthStatus -from src.primaite.simulator.file_system.file_type import FileType, get_file_type_from_extension +from primaite.simulator.file_system.file_system_item_abc import FileSystemItemABC, FileSystemItemHealthStatus +from primaite.simulator.file_system.file_type import FileType, get_file_type_from_extension _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/file_system/file_system.py b/src/primaite/simulator/file_system/file_system.py index be7375b1..41f02270 100644 --- a/src/primaite/simulator/file_system/file_system.py +++ b/src/primaite/simulator/file_system/file_system.py @@ -7,11 +7,11 @@ from typing import Dict, Optional from prettytable import MARKDOWN, PrettyTable from primaite import getLogger -from src.primaite.simulator.core import RequestManager, RequestType, SimComponent -from src.primaite.simulator.file_system.file import File -from src.primaite.simulator.file_system.file_type import FileType -from src.primaite.simulator.file_system.folder import Folder -from src.primaite.simulator.system.core.sys_log import SysLog +from primaite.simulator.core import RequestManager, RequestType, SimComponent +from primaite.simulator.file_system.file import File +from primaite.simulator.file_system.file_type import FileType +from primaite.simulator.file_system.folder import Folder +from primaite.simulator.system.core.sys_log import SysLog _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/file_system/file_system_item_abc.py b/src/primaite/simulator/file_system/file_system_item_abc.py index cad3aeaa..fbe5f4b3 100644 --- a/src/primaite/simulator/file_system/file_system_item_abc.py +++ b/src/primaite/simulator/file_system/file_system_item_abc.py @@ -6,8 +6,8 @@ from enum import Enum from typing import Dict, Optional from primaite import getLogger -from src.primaite.simulator.core import RequestManager, RequestType, SimComponent -from src.primaite.simulator.system.core.sys_log import SysLog +from primaite.simulator.core import RequestManager, RequestType, SimComponent +from primaite.simulator.system.core.sys_log import SysLog _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/file_system/folder.py b/src/primaite/simulator/file_system/folder.py index 82af255b..f0d55ef8 100644 --- a/src/primaite/simulator/file_system/folder.py +++ b/src/primaite/simulator/file_system/folder.py @@ -5,9 +5,9 @@ from typing import Dict, Optional from prettytable import MARKDOWN, PrettyTable from primaite import getLogger -from src.primaite.simulator.core import RequestManager, RequestType -from src.primaite.simulator.file_system.file import File -from src.primaite.simulator.file_system.file_system_item_abc import FileSystemItemABC, FileSystemItemHealthStatus +from primaite.simulator.core import RequestManager, RequestType +from primaite.simulator.file_system.file import File +from primaite.simulator.file_system.file_system_item_abc import FileSystemItemABC, FileSystemItemHealthStatus _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/network/container.py b/src/primaite/simulator/network/container.py index d50e4b95..9fbafc29 100644 --- a/src/primaite/simulator/network/container.py +++ b/src/primaite/simulator/network/container.py @@ -6,12 +6,12 @@ from networkx import MultiGraph from prettytable import MARKDOWN, PrettyTable from primaite import getLogger -from src.primaite.simulator.core import RequestManager, RequestType, SimComponent -from src.primaite.simulator.network.hardware.base import Link, NIC, Node, SwitchPort -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.router import Router -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.network.hardware.nodes.switch import Switch +from primaite.simulator.core import RequestManager, RequestType, SimComponent +from primaite.simulator.network.hardware.base import Link, NIC, Node, SwitchPort +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.router import Router +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.network.hardware.nodes.switch import Switch _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/network/hardware/base.py b/src/primaite/simulator/network/hardware/base.py index 43ec2363..537cebb2 100644 --- a/src/primaite/simulator/network/hardware/base.py +++ b/src/primaite/simulator/network/hardware/base.py @@ -10,22 +10,22 @@ from typing import Any, Dict, Literal, Optional, Tuple, Union from prettytable import MARKDOWN, PrettyTable from primaite import getLogger -from src.primaite.exceptions import NetworkError -from src.primaite.simulator import SIM_OUTPUT -from src.primaite.simulator.core import RequestManager, RequestType, SimComponent -from src.primaite.simulator.domain.account import Account -from src.primaite.simulator.file_system.file_system import FileSystem -from src.primaite.simulator.network.protocols.arp import ARPEntry, ARPPacket -from src.primaite.simulator.network.transmission.data_link_layer import EthernetHeader, Frame -from src.primaite.simulator.network.transmission.network_layer import ICMPPacket, ICMPType, IPPacket, IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port, TCPHeader -from src.primaite.simulator.system.applications.application import Application -from src.primaite.simulator.system.core.packet_capture import PacketCapture -from src.primaite.simulator.system.core.session_manager import SessionManager -from src.primaite.simulator.system.core.software_manager import SoftwareManager -from src.primaite.simulator.system.core.sys_log import SysLog -from src.primaite.simulator.system.processes.process import Process -from src.primaite.simulator.system.services.service import Service +from primaite.exceptions import NetworkError +from primaite.simulator import SIM_OUTPUT +from primaite.simulator.core import RequestManager, RequestType, SimComponent +from primaite.simulator.domain.account import Account +from primaite.simulator.file_system.file_system import FileSystem +from primaite.simulator.network.protocols.arp import ARPEntry, ARPPacket +from primaite.simulator.network.transmission.data_link_layer import EthernetHeader, Frame +from primaite.simulator.network.transmission.network_layer import ICMPPacket, ICMPType, IPPacket, IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port, TCPHeader +from primaite.simulator.system.applications.application import Application +from primaite.simulator.system.core.packet_capture import PacketCapture +from primaite.simulator.system.core.session_manager import SessionManager +from primaite.simulator.system.core.software_manager import SoftwareManager +from primaite.simulator.system.core.sys_log import SysLog +from primaite.simulator.system.processes.process import Process +from primaite.simulator.system.services.service import Service _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/network/hardware/nodes/computer.py b/src/primaite/simulator/network/hardware/nodes/computer.py index f378ba04..0480aca9 100644 --- a/src/primaite/simulator/network/hardware/nodes/computer.py +++ b/src/primaite/simulator/network/hardware/nodes/computer.py @@ -1,7 +1,7 @@ -from src.primaite.simulator.network.hardware.base import NIC, Node -from src.primaite.simulator.system.applications.web_browser import WebBrowser -from src.primaite.simulator.system.services.dns.dns_client import DNSClient -from src.primaite.simulator.system.services.ftp.ftp_client import FTPClient +from primaite.simulator.network.hardware.base import NIC, Node +from primaite.simulator.system.applications.web_browser import WebBrowser +from primaite.simulator.system.services.dns.dns_client import DNSClient +from primaite.simulator.system.services.ftp.ftp_client import FTPClient class Computer(Node): diff --git a/src/primaite/simulator/network/hardware/nodes/router.py b/src/primaite/simulator/network/hardware/nodes/router.py index 4761291b..c2a38aba 100644 --- a/src/primaite/simulator/network/hardware/nodes/router.py +++ b/src/primaite/simulator/network/hardware/nodes/router.py @@ -7,12 +7,12 @@ from typing import Dict, List, Optional, Tuple, Union from prettytable import MARKDOWN, PrettyTable -from src.primaite.simulator.core import RequestManager, RequestType, SimComponent -from src.primaite.simulator.network.hardware.base import ARPCache, ICMP, NIC, Node -from src.primaite.simulator.network.transmission.data_link_layer import EthernetHeader, Frame -from src.primaite.simulator.network.transmission.network_layer import ICMPPacket, ICMPType, IPPacket, IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port, TCPHeader -from src.primaite.simulator.system.core.sys_log import SysLog +from primaite.simulator.core import RequestManager, RequestType, SimComponent +from primaite.simulator.network.hardware.base import ARPCache, ICMP, NIC, Node +from primaite.simulator.network.transmission.data_link_layer import EthernetHeader, Frame +from primaite.simulator.network.transmission.network_layer import ICMPPacket, ICMPType, IPPacket, IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port, TCPHeader +from primaite.simulator.system.core.sys_log import SysLog class ACLAction(Enum): diff --git a/src/primaite/simulator/network/hardware/nodes/server.py b/src/primaite/simulator/network/hardware/nodes/server.py index 529692a3..b72cc71c 100644 --- a/src/primaite/simulator/network/hardware/nodes/server.py +++ b/src/primaite/simulator/network/hardware/nodes/server.py @@ -1,4 +1,4 @@ -from src.primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.computer import Computer class Server(Computer): diff --git a/src/primaite/simulator/network/hardware/nodes/switch.py b/src/primaite/simulator/network/hardware/nodes/switch.py index fd4614ff..fe61509c 100644 --- a/src/primaite/simulator/network/hardware/nodes/switch.py +++ b/src/primaite/simulator/network/hardware/nodes/switch.py @@ -3,9 +3,9 @@ from typing import Dict from prettytable import MARKDOWN, PrettyTable from primaite import getLogger -from src.primaite.exceptions import NetworkError -from src.primaite.simulator.network.hardware.base import Link, Node, SwitchPort -from src.primaite.simulator.network.transmission.data_link_layer import Frame +from primaite.exceptions import NetworkError +from primaite.simulator.network.hardware.base import Link, Node, SwitchPort +from primaite.simulator.network.transmission.data_link_layer import Frame _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/network/networks.py b/src/primaite/simulator/network/networks.py index d698f491..25d1bd21 100644 --- a/src/primaite/simulator/network/networks.py +++ b/src/primaite/simulator/network/networks.py @@ -1,19 +1,19 @@ from ipaddress import IPv4Address -from src.primaite.simulator.network.container import Network -from src.primaite.simulator.network.hardware.base import NIC, NodeOperatingState -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.router import ACLAction, Router -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.network.hardware.nodes.switch import Switch -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.applications.database_client import DatabaseClient -from src.primaite.simulator.system.services.database.database_service import DatabaseService -from src.primaite.simulator.system.services.dns.dns_server import DNSServer -from src.primaite.simulator.system.services.ftp.ftp_server import FTPServer -from src.primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot -from src.primaite.simulator.system.services.web_server.web_server import WebServer +from primaite.simulator.network.container import Network +from primaite.simulator.network.hardware.base import NIC, NodeOperatingState +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.router import ACLAction, Router +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.network.hardware.nodes.switch import Switch +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.applications.database_client import DatabaseClient +from primaite.simulator.system.services.database.database_service import DatabaseService +from primaite.simulator.system.services.dns.dns_server import DNSServer +from primaite.simulator.system.services.ftp.ftp_server import FTPServer +from primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot +from primaite.simulator.system.services.web_server.web_server import WebServer def client_server_routed() -> Network: diff --git a/src/primaite/simulator/network/protocols/arp.py b/src/primaite/simulator/network/protocols/arp.py index bd5e90e4..7b3e4509 100644 --- a/src/primaite/simulator/network/protocols/arp.py +++ b/src/primaite/simulator/network/protocols/arp.py @@ -5,7 +5,7 @@ from typing import Optional from pydantic import BaseModel -from src.primaite.simulator.network.protocols.packet import DataPacket +from primaite.simulator.network.protocols.packet import DataPacket class ARPEntry(BaseModel): diff --git a/src/primaite/simulator/network/protocols/dns.py b/src/primaite/simulator/network/protocols/dns.py index 4fd9ac68..4f9be51b 100644 --- a/src/primaite/simulator/network/protocols/dns.py +++ b/src/primaite/simulator/network/protocols/dns.py @@ -5,7 +5,7 @@ from typing import Optional from pydantic import BaseModel -from src.primaite.simulator.network.protocols.packet import DataPacket +from primaite.simulator.network.protocols.packet import DataPacket class DNSRequest(BaseModel): diff --git a/src/primaite/simulator/network/protocols/ftp.py b/src/primaite/simulator/network/protocols/ftp.py index 46d2e3b0..9ecc7df8 100644 --- a/src/primaite/simulator/network/protocols/ftp.py +++ b/src/primaite/simulator/network/protocols/ftp.py @@ -1,7 +1,7 @@ from enum import Enum from typing import Any, Optional, Union -from src.primaite.simulator.network.protocols.packet import DataPacket +from primaite.simulator.network.protocols.packet import DataPacket class FTPCommand(Enum): diff --git a/src/primaite/simulator/network/protocols/http.py b/src/primaite/simulator/network/protocols/http.py index e29b4cbf..2dba2614 100644 --- a/src/primaite/simulator/network/protocols/http.py +++ b/src/primaite/simulator/network/protocols/http.py @@ -1,6 +1,6 @@ from enum import Enum -from src.primaite.simulator.network.protocols.packet import DataPacket +from primaite.simulator.network.protocols.packet import DataPacket class HttpRequestMethod(Enum): diff --git a/src/primaite/simulator/network/transmission/data_link_layer.py b/src/primaite/simulator/network/transmission/data_link_layer.py index 9fa940df..fa823a60 100644 --- a/src/primaite/simulator/network/transmission/data_link_layer.py +++ b/src/primaite/simulator/network/transmission/data_link_layer.py @@ -4,12 +4,12 @@ from typing import Any, Optional from pydantic import BaseModel from primaite import getLogger -from src.primaite.simulator.network.protocols.arp import ARPPacket -from src.primaite.simulator.network.protocols.packet import DataPacket -from src.primaite.simulator.network.transmission.network_layer import ICMPPacket, IPPacket, IPProtocol -from src.primaite.simulator.network.transmission.primaite_layer import PrimaiteHeader -from src.primaite.simulator.network.transmission.transport_layer import TCPHeader, UDPHeader -from src.primaite.simulator.network.utils import convert_bytes_to_megabits +from primaite.simulator.network.protocols.arp import ARPPacket +from primaite.simulator.network.protocols.packet import DataPacket +from primaite.simulator.network.transmission.network_layer import ICMPPacket, IPPacket, IPProtocol +from primaite.simulator.network.transmission.primaite_layer import PrimaiteHeader +from primaite.simulator.network.transmission.transport_layer import TCPHeader, UDPHeader +from primaite.simulator.network.utils import convert_bytes_to_megabits _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/sim_container.py b/src/primaite/simulator/sim_container.py index af3449a8..8e820ec8 100644 --- a/src/primaite/simulator/sim_container.py +++ b/src/primaite/simulator/sim_container.py @@ -1,8 +1,8 @@ from typing import Dict -from src.primaite.simulator.core import RequestManager, RequestType, SimComponent -from src.primaite.simulator.domain.controller import DomainController -from src.primaite.simulator.network.container import Network +from primaite.simulator.core import RequestManager, RequestType, SimComponent +from primaite.simulator.domain.controller import DomainController +from primaite.simulator.network.container import Network class Simulation(SimComponent): diff --git a/src/primaite/simulator/system/applications/application.py b/src/primaite/simulator/system/applications/application.py index b1ecf680..db323cf6 100644 --- a/src/primaite/simulator/system/applications/application.py +++ b/src/primaite/simulator/system/applications/application.py @@ -2,7 +2,7 @@ from abc import abstractmethod from enum import Enum from typing import Any, Dict, Set -from src.primaite.simulator.system.software import IOSoftware, SoftwareHealthState +from primaite.simulator.system.software import IOSoftware, SoftwareHealthState class ApplicationOperatingState(Enum): diff --git a/src/primaite/simulator/system/applications/database_client.py b/src/primaite/simulator/system/applications/database_client.py index f8a9912a..d021cb78 100644 --- a/src/primaite/simulator/system/applications/database_client.py +++ b/src/primaite/simulator/system/applications/database_client.py @@ -4,10 +4,10 @@ from uuid import uuid4 from prettytable import PrettyTable -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.applications.application import Application, ApplicationOperatingState -from src.primaite.simulator.system.core.software_manager import SoftwareManager +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.applications.application import Application, ApplicationOperatingState +from primaite.simulator.system.core.software_manager import SoftwareManager class DatabaseClient(Application): diff --git a/src/primaite/simulator/system/applications/web_browser.py b/src/primaite/simulator/system/applications/web_browser.py index eb65cea1..ea9c3ac3 100644 --- a/src/primaite/simulator/system/applications/web_browser.py +++ b/src/primaite/simulator/system/applications/web_browser.py @@ -2,11 +2,11 @@ from ipaddress import IPv4Address from typing import Dict, Optional from urllib.parse import urlparse -from src.primaite.simulator.network.protocols.http import HttpRequestMethod, HttpRequestPacket, HttpResponsePacket -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.applications.application import Application -from src.primaite.simulator.system.services.dns.dns_client import DNSClient +from primaite.simulator.network.protocols.http import HttpRequestMethod, HttpRequestPacket, HttpResponsePacket +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.applications.application import Application +from primaite.simulator.system.services.dns.dns_client import DNSClient class WebBrowser(Application): diff --git a/src/primaite/simulator/system/core/packet_capture.py b/src/primaite/simulator/system/core/packet_capture.py index 4368a8d7..2e5ed008 100644 --- a/src/primaite/simulator/system/core/packet_capture.py +++ b/src/primaite/simulator/system/core/packet_capture.py @@ -3,7 +3,7 @@ import logging from pathlib import Path from typing import Any, Dict, List, Optional -from src.primaite.simulator import SIM_OUTPUT +from primaite.simulator import SIM_OUTPUT class _JSONFilter(logging.Filter): diff --git a/src/primaite/simulator/system/core/session_manager.py b/src/primaite/simulator/system/core/session_manager.py index 1f073041..360b5e73 100644 --- a/src/primaite/simulator/system/core/session_manager.py +++ b/src/primaite/simulator/system/core/session_manager.py @@ -5,15 +5,15 @@ from typing import Any, Dict, Optional, Tuple, TYPE_CHECKING, Union from prettytable import MARKDOWN, PrettyTable -from src.primaite.simulator.core import SimComponent -from src.primaite.simulator.network.transmission.data_link_layer import EthernetHeader, Frame -from src.primaite.simulator.network.transmission.network_layer import IPPacket, IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port, TCPHeader +from primaite.simulator.core import SimComponent +from primaite.simulator.network.transmission.data_link_layer import EthernetHeader, Frame +from primaite.simulator.network.transmission.network_layer import IPPacket, IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port, TCPHeader if TYPE_CHECKING: - from src.primaite.simulator.network.hardware.base import ARPCache - from src.primaite.simulator.system.core.software_manager import SoftwareManager - from src.primaite.simulator.system.core.sys_log import SysLog + from primaite.simulator.network.hardware.base import ARPCache + from primaite.simulator.system.core.software_manager import SoftwareManager + from primaite.simulator.system.core.sys_log import SysLog class Session(SimComponent): diff --git a/src/primaite/simulator/system/core/software_manager.py b/src/primaite/simulator/system/core/software_manager.py index ef4eca6c..8b8fe599 100644 --- a/src/primaite/simulator/system/core/software_manager.py +++ b/src/primaite/simulator/system/core/software_manager.py @@ -3,18 +3,18 @@ from typing import Any, Dict, List, Optional, Tuple, TYPE_CHECKING, Union from prettytable import MARKDOWN, PrettyTable -from src.primaite.simulator.file_system.file_system import FileSystem -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.applications.application import Application, ApplicationOperatingState -from src.primaite.simulator.system.core.sys_log import SysLog -from src.primaite.simulator.system.services.service import Service, ServiceOperatingState -from src.primaite.simulator.system.software import IOSoftware +from primaite.simulator.file_system.file_system import FileSystem +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.applications.application import Application, ApplicationOperatingState +from primaite.simulator.system.core.sys_log import SysLog +from primaite.simulator.system.services.service import Service, ServiceOperatingState +from primaite.simulator.system.software import IOSoftware if TYPE_CHECKING: - from src.primaite.simulator.system.core.session_manager import SessionManager - from src.primaite.simulator.system.core.sys_log import SysLog - from src.primaite.simulator.network.hardware.base import Node + from primaite.simulator.system.core.session_manager import SessionManager + from primaite.simulator.system.core.sys_log import SysLog + from primaite.simulator.network.hardware.base import Node from typing import Type, TypeVar diff --git a/src/primaite/simulator/system/core/sys_log.py b/src/primaite/simulator/system/core/sys_log.py index 3ea12758..791e0be8 100644 --- a/src/primaite/simulator/system/core/sys_log.py +++ b/src/primaite/simulator/system/core/sys_log.py @@ -3,7 +3,7 @@ from pathlib import Path from prettytable import MARKDOWN, PrettyTable -from src.primaite.simulator import SIM_OUTPUT +from primaite.simulator import SIM_OUTPUT class _NotJSONFilter(logging.Filter): diff --git a/src/primaite/simulator/system/processes/process.py b/src/primaite/simulator/system/processes/process.py index 7c4da425..c4e94845 100644 --- a/src/primaite/simulator/system/processes/process.py +++ b/src/primaite/simulator/system/processes/process.py @@ -2,7 +2,7 @@ from abc import abstractmethod from enum import Enum from typing import Dict -from src.primaite.simulator.system.software import Software +from primaite.simulator.system.software import Software class ProcessOperatingState(Enum): diff --git a/src/primaite/simulator/system/services/database/database_service.py b/src/primaite/simulator/system/services/database/database_service.py index 07eebb36..b04174bf 100644 --- a/src/primaite/simulator/system/services/database/database_service.py +++ b/src/primaite/simulator/system/services/database/database_service.py @@ -6,13 +6,13 @@ from typing import Any, Dict, List, Optional, Union from prettytable import MARKDOWN, PrettyTable -from src.primaite.simulator.file_system.file_system import File -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.core.software_manager import SoftwareManager -from src.primaite.simulator.system.services.ftp.ftp_client import FTPClient -from src.primaite.simulator.system.services.service import Service, ServiceOperatingState -from src.primaite.simulator.system.software import SoftwareHealthState +from primaite.simulator.file_system.file_system import File +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.core.software_manager import SoftwareManager +from primaite.simulator.system.services.ftp.ftp_client import FTPClient +from primaite.simulator.system.services.service import Service, ServiceOperatingState +from primaite.simulator.system.software import SoftwareHealthState class DatabaseService(Service): diff --git a/src/primaite/simulator/system/services/dns/dns_client.py b/src/primaite/simulator/system/services/dns/dns_client.py index 0d09a0dd..266ac4f6 100644 --- a/src/primaite/simulator/system/services/dns/dns_client.py +++ b/src/primaite/simulator/system/services/dns/dns_client.py @@ -2,11 +2,11 @@ from ipaddress import IPv4Address from typing import Dict, Optional from primaite import getLogger -from src.primaite.simulator.network.protocols.dns import DNSPacket, DNSRequest -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.core.software_manager import SoftwareManager -from src.primaite.simulator.system.services.service import Service +from primaite.simulator.network.protocols.dns import DNSPacket, DNSRequest +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.core.software_manager import SoftwareManager +from primaite.simulator.system.services.service import Service _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/system/services/dns/dns_server.py b/src/primaite/simulator/system/services/dns/dns_server.py index b1548bb6..90a350c8 100644 --- a/src/primaite/simulator/system/services/dns/dns_server.py +++ b/src/primaite/simulator/system/services/dns/dns_server.py @@ -4,10 +4,10 @@ from typing import Any, Dict, Optional from prettytable import MARKDOWN, PrettyTable from primaite import getLogger -from src.primaite.simulator.network.protocols.dns import DNSPacket -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.services.service import Service +from primaite.simulator.network.protocols.dns import DNSPacket +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.services.service import Service _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/system/services/ftp/ftp_client.py b/src/primaite/simulator/system/services/ftp/ftp_client.py index 221f5f7a..3e286da1 100644 --- a/src/primaite/simulator/system/services/ftp/ftp_client.py +++ b/src/primaite/simulator/system/services/ftp/ftp_client.py @@ -1,13 +1,13 @@ from ipaddress import IPv4Address from typing import Optional -from src.primaite.simulator.file_system.file_system import File -from src.primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.core.software_manager import SoftwareManager -from src.primaite.simulator.system.services.ftp.ftp_service import FTPServiceABC -from src.primaite.simulator.system.services.service import ServiceOperatingState +from primaite.simulator.file_system.file_system import File +from primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.core.software_manager import SoftwareManager +from primaite.simulator.system.services.ftp.ftp_service import FTPServiceABC +from primaite.simulator.system.services.service import ServiceOperatingState class FTPClient(FTPServiceABC): diff --git a/src/primaite/simulator/system/services/ftp/ftp_server.py b/src/primaite/simulator/system/services/ftp/ftp_server.py index 2f8603d2..23414601 100644 --- a/src/primaite/simulator/system/services/ftp/ftp_server.py +++ b/src/primaite/simulator/system/services/ftp/ftp_server.py @@ -1,11 +1,11 @@ from ipaddress import IPv4Address from typing import Any, Dict, Optional -from src.primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.services.ftp.ftp_service import FTPServiceABC -from src.primaite.simulator.system.services.service import ServiceOperatingState +from primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.services.ftp.ftp_service import FTPServiceABC +from primaite.simulator.system.services.service import ServiceOperatingState class FTPServer(FTPServiceABC): diff --git a/src/primaite/simulator/system/services/ftp/ftp_service.py b/src/primaite/simulator/system/services/ftp/ftp_service.py index 393263a4..f2c01544 100644 --- a/src/primaite/simulator/system/services/ftp/ftp_service.py +++ b/src/primaite/simulator/system/services/ftp/ftp_service.py @@ -3,10 +3,10 @@ from abc import ABC from ipaddress import IPv4Address from typing import Optional -from src.primaite.simulator.file_system.file_system import File -from src.primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.services.service import Service +from primaite.simulator.file_system.file_system import File +from primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.services.service import Service class FTPServiceABC(Service, ABC): diff --git a/src/primaite/simulator/system/services/red_services/data_manipulation_bot.py b/src/primaite/simulator/system/services/red_services/data_manipulation_bot.py index 379a9dad..996e6790 100644 --- a/src/primaite/simulator/system/services/red_services/data_manipulation_bot.py +++ b/src/primaite/simulator/system/services/red_services/data_manipulation_bot.py @@ -1,7 +1,7 @@ from ipaddress import IPv4Address from typing import Optional -from src.primaite.simulator.system.applications.database_client import DatabaseClient +from primaite.simulator.system.applications.database_client import DatabaseClient class DataManipulationBot(DatabaseClient): diff --git a/src/primaite/simulator/system/services/service.py b/src/primaite/simulator/system/services/service.py index 35a22d94..e2b04c15 100644 --- a/src/primaite/simulator/system/services/service.py +++ b/src/primaite/simulator/system/services/service.py @@ -2,8 +2,8 @@ from enum import Enum from typing import Dict, Optional from primaite import getLogger -from src.primaite.simulator.core import RequestManager, RequestType -from src.primaite.simulator.system.software import IOSoftware, SoftwareHealthState +from primaite.simulator.core import RequestManager, RequestType +from primaite.simulator.system.software import IOSoftware, SoftwareHealthState _LOGGER = getLogger(__name__) diff --git a/src/primaite/simulator/system/services/web_server/web_server.py b/src/primaite/simulator/system/services/web_server/web_server.py index e696800c..5957e4cb 100644 --- a/src/primaite/simulator/system/services/web_server/web_server.py +++ b/src/primaite/simulator/system/services/web_server/web_server.py @@ -2,16 +2,16 @@ from ipaddress import IPv4Address from typing import Any, Dict, Optional from urllib.parse import urlparse -from src.primaite.simulator.network.protocols.http import ( +from primaite.simulator.network.protocols.http import ( HttpRequestMethod, HttpRequestPacket, HttpResponsePacket, HttpStatusCode, ) -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.applications.database_client import DatabaseClient -from src.primaite.simulator.system.services.service import Service +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.applications.database_client import DatabaseClient +from primaite.simulator.system.services.service import Service class WebServer(Service): diff --git a/src/primaite/simulator/system/software.py b/src/primaite/simulator/system/software.py index 379b2335..f2627557 100644 --- a/src/primaite/simulator/system/software.py +++ b/src/primaite/simulator/system/software.py @@ -3,11 +3,11 @@ from enum import Enum from ipaddress import IPv4Address from typing import Any, Dict, Optional -from src.primaite.simulator.core import RequestManager, RequestType, SimComponent -from src.primaite.simulator.file_system.file_system import FileSystem, Folder -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.core.session_manager import Session -from src.primaite.simulator.system.core.sys_log import SysLog +from primaite.simulator.core import RequestManager, RequestType, SimComponent +from primaite.simulator.file_system.file_system import FileSystem, Folder +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.core.session_manager import Session +from primaite.simulator.system.core.sys_log import SysLog class SoftwareType(Enum): diff --git a/src/primaite/utils/package_data.py b/src/primaite/utils/package_data.py index b2e0f006..ac41e8bc 100644 --- a/src/primaite/utils/package_data.py +++ b/src/primaite/utils/package_data.py @@ -16,7 +16,7 @@ def get_file_path(path: str) -> Path: :Example: - >>> from src.primaite.utils.package_data import get_file_path + >>> from primaite.utils.package_data import get_file_path >>> main_env_config = get_file_path("config/_package_data/training_config_main.yaml") diff --git a/src/primaite/utils/session_output_writer.py b/src/primaite/utils/session_output_writer.py index c3ecfcb2..0eb18038 100644 --- a/src/primaite/utils/session_output_writer.py +++ b/src/primaite/utils/session_output_writer.py @@ -4,13 +4,13 @@ from logging import Logger from typing import Final, List, Tuple, TYPE_CHECKING, Union from primaite import getLogger -from src.primaite.transactions.transaction import Transaction +from primaite.transactions.transaction import Transaction if TYPE_CHECKING: from io import TextIOWrapper from pathlib import Path - from src.primaite.environment.primaite_env import Primaite + from primaite.environment.primaite_env import Primaite _LOGGER: Logger = getLogger(__name__) diff --git a/tests/conftest.py b/tests/conftest.py index 34b7191f..dc749cfc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -12,14 +12,14 @@ import pytest from primaite import getLogger -# from src.primaite.environment.primaite_env import Primaite -# from src.primaite.primaite_session import PrimaiteSession -from src.primaite.simulator.network.container import Network -from src.primaite.simulator.network.networks import arcd_uc2_network -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.applications.application import Application -from src.primaite.simulator.system.core.sys_log import SysLog -from src.primaite.simulator.system.services.service import Service +# from primaite.environment.primaite_env import Primaite +# from primaite.primaite_session import PrimaiteSession +from primaite.simulator.network.container import Network +from primaite.simulator.network.networks import arcd_uc2_network +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.applications.application import Application +from primaite.simulator.system.core.sys_log import SysLog +from primaite.simulator.system.services.service import Service from tests.mock_and_patch.get_session_path_mock import get_temp_session_path ACTION_SPACE_NODE_VALUES = 1 @@ -28,8 +28,8 @@ ACTION_SPACE_NODE_ACTION_VALUES = 1 _LOGGER = getLogger(__name__) # PrimAITE v3 stuff -from src.primaite.simulator.file_system.file_system import FileSystem -from src.primaite.simulator.network.hardware.base import Node +from primaite.simulator.file_system.file_system import FileSystem +from primaite.simulator.network.hardware.base import Node class TestService(Service): @@ -121,8 +121,8 @@ def temp_primaite_session(request): .. code:: python - from src.primaite.config.lay_down_config import dos_very_basic_config_path - from src.primaite.config.training_config import main_training_config_path + from primaite.config.lay_down_config import dos_very_basic_config_path + from primaite.config.training_config import main_training_config_path @pytest.mark.parametrize( "temp_primaite_session", [ diff --git a/tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py b/tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py index 5fa652b2..13f4d1f3 100644 --- a/tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py +++ b/tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py @@ -1,8 +1,8 @@ -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.system.applications.database_client import DatabaseClient -from src.primaite.simulator.system.services.database.database_service import DatabaseService -from src.primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.system.applications.database_client import DatabaseClient +from primaite.simulator.system.services.database.database_service import DatabaseService +from primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot def test_data_manipulation(uc2_network): diff --git a/tests/integration_tests/component_creation/test_action_integration.py b/tests/integration_tests/component_creation/test_action_integration.py index 110a5254..a2be923b 100644 --- a/tests/integration_tests/component_creation/test_action_integration.py +++ b/tests/integration_tests/component_creation/test_action_integration.py @@ -1,11 +1,11 @@ import pytest -from src.primaite.simulator.core import RequestType -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.network.hardware.nodes.switch import Switch -from src.primaite.simulator.sim_container import Simulation -from src.primaite.simulator.system.services.database.database_service import DatabaseService +from primaite.simulator.core import RequestType +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.network.hardware.nodes.switch import Switch +from primaite.simulator.sim_container import Simulation +from primaite.simulator.system.services.database.database_service import DatabaseService def test_passing_actions_down(monkeypatch) -> None: diff --git a/tests/integration_tests/component_creation/test_permission_system.py b/tests/integration_tests/component_creation/test_permission_system.py index 8026a01f..bcadebb4 100644 --- a/tests/integration_tests/component_creation/test_permission_system.py +++ b/tests/integration_tests/component_creation/test_permission_system.py @@ -3,8 +3,8 @@ from typing import Dict, List, Literal import pytest -from src.primaite.simulator.core import AllowAllValidator, RequestManager, RequestType, SimComponent -from src.primaite.simulator.domain.controller import AccountGroup, GroupMembershipValidator +from primaite.simulator.core import AllowAllValidator, RequestManager, RequestType, SimComponent +from primaite.simulator.domain.controller import AccountGroup, GroupMembershipValidator @pytest.mark.skip(reason="Action validation is not currently a required feature.") diff --git a/tests/integration_tests/game_layer/test_observations.py b/tests/integration_tests/game_layer/test_observations.py index 1f1e9ac1..97154f62 100644 --- a/tests/integration_tests/game_layer/test_observations.py +++ b/tests/integration_tests/game_layer/test_observations.py @@ -1,8 +1,8 @@ from gymnasium import spaces -from src.primaite.game.agent.observations import FileObservation -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.sim_container import Simulation +from primaite.game.agent.observations import FileObservation +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.sim_container import Simulation def test_file_observation(): diff --git a/tests/integration_tests/network/test_frame_transmission.py b/tests/integration_tests/network/test_frame_transmission.py index 9b77dd89..7da9fe76 100644 --- a/tests/integration_tests/network/test_frame_transmission.py +++ b/tests/integration_tests/network/test_frame_transmission.py @@ -1,4 +1,4 @@ -from src.primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState +from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState def test_node_to_node_ping(): diff --git a/tests/integration_tests/network/test_link_connection.py b/tests/integration_tests/network/test_link_connection.py index 7f95ae23..0ddf54df 100644 --- a/tests/integration_tests/network/test_link_connection.py +++ b/tests/integration_tests/network/test_link_connection.py @@ -1,4 +1,4 @@ -from src.primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState +from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState def test_link_up(): diff --git a/tests/integration_tests/network/test_network_creation.py b/tests/integration_tests/network/test_network_creation.py index 25fa179c..91218068 100644 --- a/tests/integration_tests/network/test_network_creation.py +++ b/tests/integration_tests/network/test_network_creation.py @@ -1,7 +1,7 @@ import pytest -from src.primaite.simulator.network.container import Network -from src.primaite.simulator.network.hardware.base import NIC, Node +from primaite.simulator.network.container import Network +from primaite.simulator.network.hardware.base import NIC, Node def test_adding_removing_nodes(): diff --git a/tests/integration_tests/network/test_nic_link_connection.py b/tests/integration_tests/network/test_nic_link_connection.py index d6c56acc..228099c6 100644 --- a/tests/integration_tests/network/test_nic_link_connection.py +++ b/tests/integration_tests/network/test_nic_link_connection.py @@ -1,6 +1,6 @@ import pytest -from src.primaite.simulator.network.hardware.base import Link, NIC +from primaite.simulator.network.hardware.base import Link, NIC def test_link_fails_with_same_nic(): diff --git a/tests/integration_tests/network/test_routing.py b/tests/integration_tests/network/test_routing.py index 506c895f..6053c457 100644 --- a/tests/integration_tests/network/test_routing.py +++ b/tests/integration_tests/network/test_routing.py @@ -2,10 +2,10 @@ from typing import Tuple import pytest -from src.primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState -from src.primaite.simulator.network.hardware.nodes.router import ACLAction, Router -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState +from primaite.simulator.network.hardware.nodes.router import ACLAction, Router +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port @pytest.fixture(scope="function") diff --git a/tests/integration_tests/network/test_switched_network.py b/tests/integration_tests/network/test_switched_network.py index 44333e52..5b305702 100644 --- a/tests/integration_tests/network/test_switched_network.py +++ b/tests/integration_tests/network/test_switched_network.py @@ -1,7 +1,7 @@ -from src.primaite.simulator.network.hardware.base import Link, NodeOperatingState -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.network.hardware.nodes.switch import Switch +from primaite.simulator.network.hardware.base import Link, NodeOperatingState +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.network.hardware.nodes.switch import Switch def test_switched_network(): diff --git a/tests/integration_tests/system/test_database_on_node.py b/tests/integration_tests/system/test_database_on_node.py index 0bf95e51..92056981 100644 --- a/tests/integration_tests/system/test_database_on_node.py +++ b/tests/integration_tests/system/test_database_on_node.py @@ -1,9 +1,9 @@ from ipaddress import IPv4Address -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.system.applications.database_client import DatabaseClient -from src.primaite.simulator.system.services.database.database_service import DatabaseService -from src.primaite.simulator.system.services.ftp.ftp_server import FTPServer +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.system.applications.database_client import DatabaseClient +from primaite.simulator.system.services.database.database_service import DatabaseService +from primaite.simulator.system.services.ftp.ftp_server import FTPServer def test_database_client_server_connection(uc2_network): diff --git a/tests/integration_tests/system/test_dns_client_server.py b/tests/integration_tests/system/test_dns_client_server.py index dd317ef1..e82d97a4 100644 --- a/tests/integration_tests/system/test_dns_client_server.py +++ b/tests/integration_tests/system/test_dns_client_server.py @@ -1,8 +1,8 @@ -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.system.services.dns.dns_client import DNSClient -from src.primaite.simulator.system.services.dns.dns_server import DNSServer -from src.primaite.simulator.system.services.service import ServiceOperatingState +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.system.services.dns.dns_client import DNSClient +from primaite.simulator.system.services.dns.dns_server import DNSServer +from primaite.simulator.system.services.service import ServiceOperatingState def test_dns_client_server(uc2_network): diff --git a/tests/integration_tests/system/test_ftp_client_server.py b/tests/integration_tests/system/test_ftp_client_server.py index 1ea86bd4..48dc2960 100644 --- a/tests/integration_tests/system/test_ftp_client_server.py +++ b/tests/integration_tests/system/test_ftp_client_server.py @@ -1,10 +1,10 @@ from ipaddress import IPv4Address -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.system.services.ftp.ftp_client import FTPClient -from src.primaite.simulator.system.services.ftp.ftp_server import FTPServer -from src.primaite.simulator.system.services.service import ServiceOperatingState +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.system.services.ftp.ftp_client import FTPClient +from primaite.simulator.system.services.ftp.ftp_server import FTPServer +from primaite.simulator.system.services.service import ServiceOperatingState def test_ftp_client_store_file_in_server(uc2_network): diff --git a/tests/integration_tests/system/test_web_client_server.py b/tests/integration_tests/system/test_web_client_server.py index d4f4a187..f4546cbf 100644 --- a/tests/integration_tests/system/test_web_client_server.py +++ b/tests/integration_tests/system/test_web_client_server.py @@ -1,9 +1,9 @@ -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.network.protocols.http import HttpStatusCode -from src.primaite.simulator.system.applications.application import ApplicationOperatingState -from src.primaite.simulator.system.applications.web_browser import WebBrowser -from src.primaite.simulator.system.services.service import ServiceOperatingState +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.network.protocols.http import HttpStatusCode +from primaite.simulator.system.applications.application import ApplicationOperatingState +from primaite.simulator.system.applications.web_browser import WebBrowser +from primaite.simulator.system.services.service import ServiceOperatingState def test_web_page_home_page(uc2_network): diff --git a/tests/unit_tests/_primaite/_simulator/_domain/test_account.py b/tests/unit_tests/_primaite/_simulator/_domain/test_account.py index 92f3cfd9..96c34996 100644 --- a/tests/unit_tests/_primaite/_simulator/_domain/test_account.py +++ b/tests/unit_tests/_primaite/_simulator/_domain/test_account.py @@ -1,5 +1,5 @@ """Test the account module of the simulator.""" -from src.primaite.simulator.domain.account import Account, AccountType +from primaite.simulator.domain.account import Account, AccountType def test_account_serialise(): diff --git a/tests/unit_tests/_primaite/_simulator/_file_system/test_file.py b/tests/unit_tests/_primaite/_simulator/_file_system/test_file.py index ef4b1456..32efe029 100644 --- a/tests/unit_tests/_primaite/_simulator/_file_system/test_file.py +++ b/tests/unit_tests/_primaite/_simulator/_file_system/test_file.py @@ -1,6 +1,6 @@ -from src.primaite.simulator.file_system.file import File -from src.primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus -from src.primaite.simulator.file_system.file_type import FileType +from primaite.simulator.file_system.file import File +from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus +from primaite.simulator.file_system.file_type import FileType def test_create_file_no_extension(file_system): diff --git a/tests/unit_tests/_primaite/_simulator/_file_system/test_file_actions.py b/tests/unit_tests/_primaite/_simulator/_file_system/test_file_actions.py index a46fd4f9..aa8faa90 100644 --- a/tests/unit_tests/_primaite/_simulator/_file_system/test_file_actions.py +++ b/tests/unit_tests/_primaite/_simulator/_file_system/test_file_actions.py @@ -2,10 +2,10 @@ from typing import Tuple import pytest -from src.primaite.simulator.file_system.file import File -from src.primaite.simulator.file_system.file_system import FileSystem -from src.primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus -from src.primaite.simulator.file_system.folder import Folder +from primaite.simulator.file_system.file import File +from primaite.simulator.file_system.file_system import FileSystem +from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus +from primaite.simulator.file_system.folder import Folder @pytest.fixture(scope="function") diff --git a/tests/unit_tests/_primaite/_simulator/_file_system/test_file_system.py b/tests/unit_tests/_primaite/_simulator/_file_system/test_file_system.py index 4d712436..4defc80c 100644 --- a/tests/unit_tests/_primaite/_simulator/_file_system/test_file_system.py +++ b/tests/unit_tests/_primaite/_simulator/_file_system/test_file_system.py @@ -1,7 +1,7 @@ import pytest -from src.primaite.simulator.file_system.file_system import FileSystem -from src.primaite.simulator.file_system.file_type import FileType +from primaite.simulator.file_system.file_system import FileSystem +from primaite.simulator.file_system.file_type import FileType def test_create_folder_and_file(file_system): diff --git a/tests/unit_tests/_primaite/_simulator/_file_system/test_file_system_actions.py b/tests/unit_tests/_primaite/_simulator/_file_system/test_file_system_actions.py index 0070c218..1c8513f9 100644 --- a/tests/unit_tests/_primaite/_simulator/_file_system/test_file_system_actions.py +++ b/tests/unit_tests/_primaite/_simulator/_file_system/test_file_system_actions.py @@ -2,9 +2,9 @@ from typing import Tuple import pytest -from src.primaite.simulator.file_system.file import File -from src.primaite.simulator.file_system.file_system import FileSystem -from src.primaite.simulator.file_system.folder import Folder +from primaite.simulator.file_system.file import File +from primaite.simulator.file_system.file_system import FileSystem +from primaite.simulator.file_system.folder import Folder @pytest.fixture(scope="function") diff --git a/tests/unit_tests/_primaite/_simulator/_file_system/test_folder.py b/tests/unit_tests/_primaite/_simulator/_file_system/test_folder.py index 5b586e03..bada2dab 100644 --- a/tests/unit_tests/_primaite/_simulator/_file_system/test_folder.py +++ b/tests/unit_tests/_primaite/_simulator/_file_system/test_folder.py @@ -1,8 +1,8 @@ import pytest -from src.primaite.simulator.file_system.file import File -from src.primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus -from src.primaite.simulator.file_system.folder import Folder +from primaite.simulator.file_system.file import File +from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus +from primaite.simulator.file_system.folder import Folder @pytest.mark.skip(reason="Implementation for quarantine not needed yet") diff --git a/tests/unit_tests/_primaite/_simulator/_file_system/test_folder_actions.py b/tests/unit_tests/_primaite/_simulator/_file_system/test_folder_actions.py index e058d280..efa74e1f 100644 --- a/tests/unit_tests/_primaite/_simulator/_file_system/test_folder_actions.py +++ b/tests/unit_tests/_primaite/_simulator/_file_system/test_folder_actions.py @@ -2,10 +2,10 @@ from typing import Tuple import pytest -from src.primaite.simulator.file_system.file import File -from src.primaite.simulator.file_system.file_system import FileSystem -from src.primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus -from src.primaite.simulator.file_system.folder import Folder +from primaite.simulator.file_system.file import File +from primaite.simulator.file_system.file_system import FileSystem +from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus +from primaite.simulator.file_system.folder import Folder @pytest.fixture(scope="function") diff --git a/tests/unit_tests/_primaite/_simulator/_network/_hardware/nodes/test_acl.py b/tests/unit_tests/_primaite/_simulator/_network/_hardware/nodes/test_acl.py index ac1aee2f..554cba38 100644 --- a/tests/unit_tests/_primaite/_simulator/_network/_hardware/nodes/test_acl.py +++ b/tests/unit_tests/_primaite/_simulator/_network/_hardware/nodes/test_acl.py @@ -1,8 +1,8 @@ from ipaddress import IPv4Address -from src.primaite.simulator.network.hardware.nodes.router import ACLAction, Router -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.network.hardware.nodes.router import ACLAction, Router +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port def test_add_rule(): diff --git a/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_nic.py b/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_nic.py index ea2dca0b..1bf2cdbb 100644 --- a/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_nic.py +++ b/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_nic.py @@ -3,7 +3,7 @@ from ipaddress import IPv4Address import pytest -from src.primaite.simulator.network.hardware.base import generate_mac_address, NIC +from primaite.simulator.network.hardware.base import generate_mac_address, NIC def test_mac_address_generation(): diff --git a/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node.py b/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node.py index ef2088b1..0e5fb4c7 100644 --- a/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node.py +++ b/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node.py @@ -3,7 +3,7 @@ from ipaddress import IPv4Address import pytest -from src.primaite.simulator.network.hardware.base import Node +from primaite.simulator.network.hardware.base import Node def test_node_creation(): diff --git a/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node_actions.py b/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node_actions.py index 7f4b3f49..5fe5df16 100644 --- a/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node_actions.py +++ b/tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node_actions.py @@ -1,10 +1,10 @@ import pytest -from src.primaite.simulator.file_system.file import File -from src.primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus -from src.primaite.simulator.file_system.folder import Folder -from src.primaite.simulator.network.hardware.base import Node, NodeOperatingState -from src.primaite.simulator.system.software import SoftwareHealthState +from primaite.simulator.file_system.file import File +from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus +from primaite.simulator.file_system.folder import Folder +from primaite.simulator.network.hardware.base import Node, NodeOperatingState +from primaite.simulator.system.software import SoftwareHealthState @pytest.fixture diff --git a/tests/unit_tests/_primaite/_simulator/_network/_transmission/test_data_link_layer.py b/tests/unit_tests/_primaite/_simulator/_network/_transmission/test_data_link_layer.py index 35603fd0..f9b89de5 100644 --- a/tests/unit_tests/_primaite/_simulator/_network/_transmission/test_data_link_layer.py +++ b/tests/unit_tests/_primaite/_simulator/_network/_transmission/test_data_link_layer.py @@ -1,9 +1,9 @@ import pytest -from src.primaite.simulator.network.transmission.data_link_layer import EthernetHeader, Frame -from src.primaite.simulator.network.transmission.network_layer import ICMPPacket, IPPacket, IPProtocol, Precedence -from src.primaite.simulator.network.transmission.primaite_layer import AgentSource, DataStatus -from src.primaite.simulator.network.transmission.transport_layer import Port, TCPFlags, TCPHeader, UDPHeader +from primaite.simulator.network.transmission.data_link_layer import EthernetHeader, Frame +from primaite.simulator.network.transmission.network_layer import ICMPPacket, IPPacket, IPProtocol, Precedence +from primaite.simulator.network.transmission.primaite_layer import AgentSource, DataStatus +from primaite.simulator.network.transmission.transport_layer import Port, TCPFlags, TCPHeader, UDPHeader def test_frame_minimal_instantiation(): diff --git a/tests/unit_tests/_primaite/_simulator/_network/_transmission/test_network_layer.py b/tests/unit_tests/_primaite/_simulator/_network/_transmission/test_network_layer.py index 64a88ea5..a7189452 100644 --- a/tests/unit_tests/_primaite/_simulator/_network/_transmission/test_network_layer.py +++ b/tests/unit_tests/_primaite/_simulator/_network/_transmission/test_network_layer.py @@ -1,6 +1,6 @@ import pytest -from src.primaite.simulator.network.transmission.network_layer import ICMPPacket, ICMPType +from primaite.simulator.network.transmission.network_layer import ICMPPacket, ICMPType def test_icmp_minimal_header_creation(): diff --git a/tests/unit_tests/_primaite/_simulator/_network/test_container.py b/tests/unit_tests/_primaite/_simulator/_network/test_container.py index 65dd884f..66bd59a9 100644 --- a/tests/unit_tests/_primaite/_simulator/_network/test_container.py +++ b/tests/unit_tests/_primaite/_simulator/_network/test_container.py @@ -2,7 +2,7 @@ import json import pytest -from src.primaite.simulator.network.container import Network +from primaite.simulator.network.container import Network def test_creating_container(): diff --git a/tests/unit_tests/_primaite/_simulator/_system/_applications/test_web_browser.py b/tests/unit_tests/_primaite/_simulator/_system/_applications/test_web_browser.py index 2f78b476..b2724369 100644 --- a/tests/unit_tests/_primaite/_simulator/_system/_applications/test_web_browser.py +++ b/tests/unit_tests/_primaite/_simulator/_system/_applications/test_web_browser.py @@ -1,10 +1,10 @@ import pytest -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.protocols.http import HttpResponsePacket, HttpStatusCode -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.applications.web_browser import WebBrowser +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.protocols.http import HttpResponsePacket, HttpStatusCode +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.applications.web_browser import WebBrowser @pytest.fixture(scope="function") diff --git a/tests/unit_tests/_primaite/_simulator/_system/_services/_red_services/test_data_manipulation_bot.py b/tests/unit_tests/_primaite/_simulator/_system/_services/_red_services/test_data_manipulation_bot.py index 0eca1794..dd785cc1 100644 --- a/tests/unit_tests/_primaite/_simulator/_system/_services/_red_services/test_data_manipulation_bot.py +++ b/tests/unit_tests/_primaite/_simulator/_system/_services/_red_services/test_data_manipulation_bot.py @@ -1,10 +1,10 @@ from ipaddress import IPv4Address -from src.primaite.simulator.network.hardware.base import Node -from src.primaite.simulator.network.networks import arcd_uc2_network -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot +from primaite.simulator.network.hardware.base import Node +from primaite.simulator.network.networks import arcd_uc2_network +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.services.red_services.data_manipulation_bot import DataManipulationBot def test_creation(): diff --git a/tests/unit_tests/_primaite/_simulator/_system/_services/test_database.py b/tests/unit_tests/_primaite/_simulator/_system/_services/test_database.py index 2beef740..7662fbff 100644 --- a/tests/unit_tests/_primaite/_simulator/_system/_services/test_database.py +++ b/tests/unit_tests/_primaite/_simulator/_system/_services/test_database.py @@ -1,7 +1,7 @@ import pytest -from src.primaite.simulator.network.hardware.base import Node -from src.primaite.simulator.system.services.database.database_service import DatabaseService +from primaite.simulator.network.hardware.base import Node +from primaite.simulator.system.services.database.database_service import DatabaseService @pytest.fixture(scope="function") diff --git a/tests/unit_tests/_primaite/_simulator/_system/_services/test_dns.py b/tests/unit_tests/_primaite/_simulator/_system/_services/test_dns.py index 20306a1a..dc6df5d4 100644 --- a/tests/unit_tests/_primaite/_simulator/_system/_services/test_dns.py +++ b/tests/unit_tests/_primaite/_simulator/_system/_services/test_dns.py @@ -2,14 +2,14 @@ from ipaddress import IPv4Address import pytest -from src.primaite.simulator.network.hardware.base import Node -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.network.protocols.dns import DNSPacket, DNSReply, DNSRequest -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.services.dns.dns_client import DNSClient -from src.primaite.simulator.system.services.dns.dns_server import DNSServer +from primaite.simulator.network.hardware.base import Node +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.network.protocols.dns import DNSPacket, DNSReply, DNSRequest +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.services.dns.dns_client import DNSClient +from primaite.simulator.system.services.dns.dns_server import DNSServer @pytest.fixture(scope="function") diff --git a/tests/unit_tests/_primaite/_simulator/_system/_services/test_ftp.py b/tests/unit_tests/_primaite/_simulator/_system/_services/test_ftp.py index d2e4f321..d382b8dd 100644 --- a/tests/unit_tests/_primaite/_simulator/_system/_services/test_ftp.py +++ b/tests/unit_tests/_primaite/_simulator/_system/_services/test_ftp.py @@ -2,14 +2,14 @@ from ipaddress import IPv4Address import pytest -from src.primaite.simulator.network.hardware.base import Node -from src.primaite.simulator.network.hardware.nodes.computer import Computer -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.services.ftp.ftp_client import FTPClient -from src.primaite.simulator.system.services.ftp.ftp_server import FTPServer +from primaite.simulator.network.hardware.base import Node +from primaite.simulator.network.hardware.nodes.computer import Computer +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.network.protocols.ftp import FTPCommand, FTPPacket, FTPStatusCode +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.services.ftp.ftp_client import FTPClient +from primaite.simulator.system.services.ftp.ftp_server import FTPServer @pytest.fixture(scope="function") diff --git a/tests/unit_tests/_primaite/_simulator/_system/_services/test_service_actions.py b/tests/unit_tests/_primaite/_simulator/_system/_services/test_service_actions.py index 9f64c8d6..6b2ee0a7 100644 --- a/tests/unit_tests/_primaite/_simulator/_system/_services/test_service_actions.py +++ b/tests/unit_tests/_primaite/_simulator/_system/_services/test_service_actions.py @@ -1,5 +1,5 @@ -from src.primaite.simulator.system.services.service import ServiceOperatingState -from src.primaite.simulator.system.software import SoftwareHealthState +from primaite.simulator.system.services.service import ServiceOperatingState +from primaite.simulator.system.software import SoftwareHealthState def test_service_scan(service): diff --git a/tests/unit_tests/_primaite/_simulator/_system/_services/test_services.py b/tests/unit_tests/_primaite/_simulator/_system/_services/test_services.py index ba27e6cc..b32463a2 100644 --- a/tests/unit_tests/_primaite/_simulator/_system/_services/test_services.py +++ b/tests/unit_tests/_primaite/_simulator/_system/_services/test_services.py @@ -1,5 +1,5 @@ -from src.primaite.simulator.system.services.service import ServiceOperatingState -from src.primaite.simulator.system.software import SoftwareHealthState +from primaite.simulator.system.services.service import ServiceOperatingState +from primaite.simulator.system.software import SoftwareHealthState def test_scan(service): diff --git a/tests/unit_tests/_primaite/_simulator/_system/_services/test_web_server.py b/tests/unit_tests/_primaite/_simulator/_system/_services/test_web_server.py index 4a5c488a..e6f0b9d9 100644 --- a/tests/unit_tests/_primaite/_simulator/_system/_services/test_web_server.py +++ b/tests/unit_tests/_primaite/_simulator/_system/_services/test_web_server.py @@ -1,15 +1,15 @@ import pytest -from src.primaite.simulator.network.hardware.nodes.server import Server -from src.primaite.simulator.network.protocols.http import ( +from primaite.simulator.network.hardware.nodes.server import Server +from primaite.simulator.network.protocols.http import ( HttpRequestMethod, HttpRequestPacket, HttpResponsePacket, HttpStatusCode, ) -from src.primaite.simulator.network.transmission.network_layer import IPProtocol -from src.primaite.simulator.network.transmission.transport_layer import Port -from src.primaite.simulator.system.services.web_server.web_server import WebServer +from primaite.simulator.network.transmission.network_layer import IPProtocol +from primaite.simulator.network.transmission.transport_layer import Port +from primaite.simulator.system.services.web_server.web_server import WebServer @pytest.fixture(scope="function") diff --git a/tests/unit_tests/_primaite/_simulator/test_core.py b/tests/unit_tests/_primaite/_simulator/test_core.py index 2e801816..069e6ea2 100644 --- a/tests/unit_tests/_primaite/_simulator/test_core.py +++ b/tests/unit_tests/_primaite/_simulator/test_core.py @@ -3,7 +3,7 @@ from typing import Callable, Dict, List, Literal, Tuple import pytest from pydantic import ValidationError -from src.primaite.simulator.core import SimComponent +from primaite.simulator.core import SimComponent class TestIsolatedSimComponent: diff --git a/tests/unit_tests/_primaite/_simulator/test_sim_conatiner.py b/tests/unit_tests/_primaite/_simulator/test_sim_conatiner.py index 98a204ca..4543259d 100644 --- a/tests/unit_tests/_primaite/_simulator/test_sim_conatiner.py +++ b/tests/unit_tests/_primaite/_simulator/test_sim_conatiner.py @@ -1,4 +1,4 @@ -from src.primaite.simulator.sim_container import Simulation +from primaite.simulator.sim_container import Simulation def test_creating_empty_simulation():