oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1962: merge dev into branch + fix minor diffs + ensure that imports pull from src

Browse Source
This commit is contained in:
Czar.Echavez
2023-11-08 10:36:47 +00:00
parent eba10ae5ef c060991084
commit f5df1366a7
201 changed files with 4799 additions and 16458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit_tests/_primaite/_simulator/_domain/test_account.py
View File

@@ -1,5 +1,5 @@
"""Test the account module of the simulator."""
from primaite.simulator.domain.account import Account, AccountType
from src.primaite.simulator.domain.account import Account, AccountType
def test_account_serialise():

6
tests/unit_tests/_primaite/_simulator/_file_system/test_file.py
View File

@@ -1,6 +1,6 @@
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
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
def test_create_file_no_extension(file_system):

6
tests/unit_tests/_primaite/_simulator/_file_system/test_file_actions.py
View File

@@ -2,8 +2,10 @@ from typing import Tuple
import pytest
from primaite.simulator.file_system.file_system import File, FileSystem, Folder
from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
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
@pytest.fixture(scope="function")

6
tests/unit_tests/_primaite/_simulator/_file_system/test_file_system.py
View File

@@ -1,9 +1,7 @@
import pytest
from primaite.simulator.file_system.file import File
from primaite.simulator.file_system.file_system import FileSystem
from primaite.simulator.file_system.file_type import FileType
from primaite.simulator.file_system.folder import Folder
from src.primaite.simulator.file_system.file_system import FileSystem
from src.primaite.simulator.file_system.file_type import FileType
def test_create_folder_and_file(file_system):

5
tests/unit_tests/_primaite/_simulator/_file_system/test_file_system_actions.py
View File

@@ -2,8 +2,9 @@ from typing import Tuple
import pytest
from primaite.simulator.file_system.file_system import File, FileSystem, Folder
from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
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
@pytest.fixture(scope="function")

6
tests/unit_tests/_primaite/_simulator/_file_system/test_folder.py
View File

@@ -1,8 +1,8 @@
import pytest
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 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
@pytest.mark.skip(reason="Implementation for quarantine not needed yet")

6
tests/unit_tests/_primaite/_simulator/_file_system/test_folder_actions.py
View File

@@ -2,8 +2,10 @@ from typing import Tuple
import pytest
from primaite.simulator.file_system.file_system import File, FileSystem, Folder
from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
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
@pytest.fixture(scope="function")

6
tests/unit_tests/_primaite/_simulator/_network/_hardware/nodes/test_acl.py
View File

@@ -1,8 +1,8 @@
from ipaddress import IPv4Address
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
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
def test_add_rule():

2
tests/unit_tests/_primaite/_simulator/_network/_hardware/test_nic.py
View File

@@ -3,7 +3,7 @@ from ipaddress import IPv4Address
import pytest
from primaite.simulator.network.hardware.base import generate_mac_address, NIC
from src.primaite.simulator.network.hardware.base import generate_mac_address, NIC
def test_mac_address_generation():

2
tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node.py
View File

@@ -3,7 +3,7 @@ from ipaddress import IPv4Address
import pytest
from primaite.simulator.network.hardware.base import Node
from src.primaite.simulator.network.hardware.base import Node
def test_node_creation():

12
tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node_actions.py
View File

@@ -1,12 +1,10 @@
import pytest
from primaite.simulator.file_system.file_system import File, Folder
from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
from primaite.simulator.network.hardware.base import Node, NodeOperatingState
from primaite.simulator.system.applications.application import Application
from primaite.simulator.system.processes.process import Process
from primaite.simulator.system.services.service import Service
from primaite.simulator.system.software import SoftwareHealthState
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
@pytest.fixture

8
tests/unit_tests/_primaite/_simulator/_network/_transmission/test_data_link_layer.py
View File

@@ -1,9 +1,9 @@
import pytest
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
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
def test_frame_minimal_instantiation():

2
tests/unit_tests/_primaite/_simulator/_network/_transmission/test_network_layer.py
View File

@@ -1,6 +1,6 @@
import pytest
from primaite.simulator.network.transmission.network_layer import ICMPPacket, ICMPType
from src.primaite.simulator.network.transmission.network_layer import ICMPPacket, ICMPType
def test_icmp_minimal_header_creation():

2
tests/unit_tests/_primaite/_simulator/_network/test_container.py
View File

@@ -2,7 +2,7 @@ import json
import pytest
from primaite.simulator.network.container import Network
from src.primaite.simulator.network.container import Network
def test_creating_container():

10
tests/unit_tests/_primaite/_simulator/_system/_applications/test_web_browser.py
View File

@@ -1,10 +1,10 @@
import pytest
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
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
@pytest.fixture(scope="function")

10
tests/unit_tests/_primaite/_simulator/_system/_services/_red_services/test_data_manipulation_bot.py
View File

@@ -1,10 +1,10 @@
from ipaddress import IPv4Address
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
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
def test_creation():

4
tests/unit_tests/_primaite/_simulator/_system/_services/test_database.py
View File

@@ -1,7 +1,7 @@
import pytest
from primaite.simulator.network.hardware.base import Node
from primaite.simulator.system.services.database.database_service import DatabaseService
from src.primaite.simulator.network.hardware.base import Node
from src.primaite.simulator.system.services.database.database_service import DatabaseService
@pytest.fixture(scope="function")

16
tests/unit_tests/_primaite/_simulator/_system/_services/test_dns.py
View File

@@ -2,14 +2,14 @@ from ipaddress import IPv4Address
import pytest
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
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
@pytest.fixture(scope="function")

16
tests/unit_tests/_primaite/_simulator/_system/_services/test_ftp.py
View File

@@ -2,14 +2,14 @@ from ipaddress import IPv4Address
import pytest
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
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
@pytest.fixture(scope="function")

4
tests/unit_tests/_primaite/_simulator/_system/_services/test_service_actions.py
View File

@@ -1,5 +1,5 @@
from primaite.simulator.system.services.service import ServiceOperatingState
from primaite.simulator.system.software import SoftwareHealthState
from src.primaite.simulator.system.services.service import ServiceOperatingState
from src.primaite.simulator.system.software import SoftwareHealthState
def test_service_scan(service):

4
tests/unit_tests/_primaite/_simulator/_system/_services/test_services.py
View File

@@ -1,5 +1,5 @@
from primaite.simulator.system.services.service import ServiceOperatingState
from primaite.simulator.system.software import SoftwareHealthState
from src.primaite.simulator.system.services.service import ServiceOperatingState
from src.primaite.simulator.system.software import SoftwareHealthState
def test_scan(service):

10
tests/unit_tests/_primaite/_simulator/_system/_services/test_web_server.py
View File

@@ -1,15 +1,15 @@
import pytest
from primaite.simulator.network.hardware.nodes.server import Server
from primaite.simulator.network.protocols.http import (
from src.primaite.simulator.network.hardware.nodes.server import Server
from src.primaite.simulator.network.protocols.http import (
HttpRequestMethod,
HttpRequestPacket,
HttpResponsePacket,
HttpStatusCode,
)
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
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
@pytest.fixture(scope="function")

2
tests/unit_tests/_primaite/_simulator/test_core.py
View File

@@ -3,7 +3,7 @@ from typing import Callable, Dict, List, Literal, Tuple
import pytest
from pydantic import ValidationError
from primaite.simulator.core import SimComponent
from src.primaite.simulator.core import SimComponent
class TestIsolatedSimComponent:

2
tests/unit_tests/_primaite/_simulator/test_sim_conatiner.py
View File

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