#1962: revert pulling from src

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

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__)
 

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__)
 

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

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

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

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

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__)
 

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