#1962: revert pulling from src

This commit is contained in:
Czar.Echavez
2023-11-08 10:48:41 +00:00
parent f5df1366a7
commit be4a467877
87 changed files with 335 additions and 335 deletions

View File

@@ -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",
[

View File

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

View File

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

View File

@@ -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.")

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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")

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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")

View File

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

View File

@@ -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")

View File

@@ -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")

View File

@@ -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")

View File

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

View File

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

View File

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

View File

@@ -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

View File

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

View File

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

View File

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

View File

@@ -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")

View File

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

View File

@@ -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")

View File

@@ -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")

View File

@@ -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")

View File

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

View File

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

View File

@@ -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")

View File

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

View File

@@ -1,4 +1,4 @@
from src.primaite.simulator.sim_container import Simulation
from primaite.simulator.sim_container import Simulation
def test_creating_empty_simulation():