Merge origin/dev into feature/1859

tests/unit_tests/_primaite/_simulator/_system/_services/test_dns.py

@@ -3,6 +3,7 @@ from ipaddress import IPv4Address
 import pytest
 
 from primaite.simulator.network.hardware.base import Node
+from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
 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
@@ -10,15 +11,19 @@ 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 primaite.simulator.system.services.service import ServiceOperatingState
 
 
 @pytest.fixture(scope="function")
 def dns_server() -> Node:
     node = Server(
-        hostname="dns_server", ip_address="192.168.1.10", subnet_mask="255.255.255.0", default_gateway="192.168.1.1"
+        hostname="dns_server",
+        ip_address="192.168.1.10",
+        subnet_mask="255.255.255.0",
+        default_gateway="192.168.1.1",
+        operating_state=NodeOperatingState.ON,
     )
     node.software_manager.install(software_class=DNSServer)
-    node.software_manager.software["DNSServer"].start()
     return node
 
 
@@ -50,6 +55,44 @@ def test_create_dns_client(dns_client):
     assert dns_client_service.protocol is IPProtocol.TCP
 
 
+def test_dns_client_add_domain_to_cache_when_not_running(dns_client):
+    dns_client_service: DNSClient = dns_client.software_manager.software["DNSClient"]
+    assert dns_client.operating_state is NodeOperatingState.OFF
+    assert dns_client_service.operating_state is ServiceOperatingState.STOPPED
+
+    assert (
+        dns_client_service.add_domain_to_cache(domain_name="test.com", ip_address=IPv4Address("192.168.1.100")) is False
+    )
+
+    assert dns_client_service.dns_cache.get("test.com") is None
+
+
+def test_dns_client_check_domain_exists_when_not_running(dns_client):
+    dns_client.operating_state = NodeOperatingState.ON
+    dns_client_service: DNSClient = dns_client.software_manager.software["DNSClient"]
+    dns_client_service.start()
+
+    assert dns_client.operating_state is NodeOperatingState.ON
+    assert dns_client_service.operating_state is ServiceOperatingState.RUNNING
+
+    assert (
+        dns_client_service.add_domain_to_cache(domain_name="test.com", ip_address=IPv4Address("192.168.1.100"))
+        is not False
+    )
+
+    assert dns_client_service.check_domain_exists("test.com") is True
+
+    dns_client.power_off()
+
+    for i in range(dns_client.shut_down_duration + 1):
+        dns_client.apply_timestep(timestep=i)
+
+    assert dns_client.operating_state is NodeOperatingState.OFF
+    assert dns_client_service.operating_state is ServiceOperatingState.STOPPED
+
+    assert dns_client_service.check_domain_exists("test.com") is False
+
+
 def test_dns_server_domain_name_registration(dns_server):
     """Test to check if the domain name registration works."""
     dns_server_service: DNSServer = dns_server.software_manager.software["DNSServer"]
@@ -64,7 +107,9 @@ def test_dns_server_domain_name_registration(dns_server):
 
 def test_dns_client_check_domain_in_cache(dns_client):
     """Test to make sure that the check_domain_in_cache returns the correct values."""
+    dns_client.operating_state = NodeOperatingState.ON
     dns_client_service: DNSClient = dns_client.software_manager.software["DNSClient"]
+    dns_client_service.start()
 
     # add a domain to the dns client cache
     dns_client_service.add_domain_to_cache("real-domain.com", IPv4Address("192.168.1.12"))

tests/unit_tests/_primaite/_simulator/_system/_services/test_ftp.py

@@ -3,6 +3,7 @@ from ipaddress import IPv4Address
 import pytest
 
 from primaite.simulator.network.hardware.base import Node
+from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
 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
@@ -15,17 +16,24 @@ from primaite.simulator.system.services.ftp.ftp_server import FTPServer
 @pytest.fixture(scope="function")
 def ftp_server() -> Node:
     node = Server(
-        hostname="ftp_server", ip_address="192.168.1.10", subnet_mask="255.255.255.0", default_gateway="192.168.1.1"
+        hostname="ftp_server",
+        ip_address="192.168.1.10",
+        subnet_mask="255.255.255.0",
+        default_gateway="192.168.1.1",
+        operating_state=NodeOperatingState.ON,
     )
     node.software_manager.install(software_class=FTPServer)
-    node.software_manager.software["FTPServer"].start()
     return node
 
 
 @pytest.fixture(scope="function")
 def ftp_client() -> Node:
     node = Computer(
-        hostname="ftp_client", ip_address="192.168.1.11", subnet_mask="255.255.255.0", default_gateway="192.168.1.1"
+        hostname="ftp_client",
+        ip_address="192.168.1.11",
+        subnet_mask="255.255.255.0",
+        default_gateway="192.168.1.1",
+        operating_state=NodeOperatingState.ON,
     )
     return node