#1962: merge dev into branch + fix minor diffs + ensure that imports pull 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 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
+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
 
 
 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 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
+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
 
 _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 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
+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
 
 _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 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
+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
 
 
 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 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
+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
 
 
 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 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
+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
 
 
 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 primaite.simulator.system.applications.database_client import DatabaseClient
+from src.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 primaite.simulator.core import RequestManager, RequestType
-from primaite.simulator.system.software import IOSoftware, SoftwareHealthState
+from src.primaite.simulator.core import RequestManager, RequestType
+from src.primaite.simulator.system.software import IOSoftware, SoftwareHealthState
 
 _LOGGER = getLogger(__name__)
 
@@ -15,14 +15,14 @@ class ServiceOperatingState(Enum):
     "The service is currently running."
     STOPPED = 2
     "The service is not running."
-    INSTALLING = 3
-    "The service is being installed or updated."
-    RESTARTING = 4
-    "The service is in the process of restarting."
-    PAUSED = 5
+    PAUSED = 3
     "The service is temporarily paused."
-    DISABLED = 6
+    DISABLED = 4
     "The service is disabled and cannot be started."
+    INSTALLING = 5
+    "The service is being installed or updated."
+    RESTARTING = 6
+    "The service is in the process of restarting."
 
 
 class Service(IOSoftware):
@@ -68,7 +68,7 @@ class Service(IOSoftware):
         :rtype: Dict
         """
         state = super().describe_state()
-        state["operating_state"] = self.operating_state.name
+        state["operating_state"] = self.operating_state.value
         state["health_state_actual"] = self.health_state_actual
         state["health_state_visible"] = self.health_state_visible
         return state

src/primaite/simulator/system/services/web_server/web_server.py

@@ -1,22 +1,39 @@
 from ipaddress import IPv4Address
-from typing import Any, Optional
+from typing import Any, Dict, Optional
 from urllib.parse import urlparse
 
-from primaite.simulator.network.protocols.http import (
+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.applications.database_client import DatabaseClient
-from primaite.simulator.system.services.service import Service
+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
 
 
 class WebServer(Service):
     """Class used to represent a Web Server Service in simulation."""
 
+    last_response_status_code: Optional[HttpStatusCode] = None
+
+    def describe_state(self) -> Dict:
+        """
+        Produce a dictionary describing the current state of this object.
+
+        Please see :py:meth:`primaite.simulator.core.SimComponent.describe_state` for a more detailed explanation.
+
+        :return: Current state of this object and child objects.
+        :rtype: Dict
+        """
+        state = super().describe_state()
+        state["last_response_status_code"] = (
+            self.last_response_status_code.value if self.last_response_status_code else None
+        )
+        return state
+
     def __init__(self, **kwargs):
         kwargs["name"] = "WebServer"
         kwargs["protocol"] = IPProtocol.TCP
@@ -66,6 +83,7 @@ class WebServer(Service):
         self.send(payload=response, session_id=session_id)
 
         # return true if response is OK
+        self.last_response_status_code = response.status_code
         return response.status_code == HttpStatusCode.OK
 
     def _handle_get_request(self, payload: HttpRequestPacket) -> HttpResponsePacket: