#3062 - Discriminator bugfixes

src/primaite/game/game.py

@@ -384,7 +384,7 @@ class PrimaiteGame:
                     if service_class is not None:
                         _LOGGER.debug(f"installing {service_type} on node {new_node.hostname}")
                         new_node.software_manager.install(service_class, software_config=service_cfg.get("options", {}))
-                        new_service = new_node.software_manager.software[service_class.__name__]
+                        new_service = new_node.software_manager.software[service_type]
 
                         # fixing duration for the service
                         if "fixing_duration" in service_cfg.get("options", {}):

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

@@ -33,7 +33,7 @@ class ARP(Service, discriminator="arp"):
     arp: Dict[IPV4Address, ARPEntry] = {}
 
     def __init__(self, **kwargs):
-        kwargs["name"] = "ARP"
+        kwargs["name"] = "arp"
         kwargs["port"] = PORT_LOOKUP["ARP"]
         kwargs["protocol"] = PROTOCOL_LOOKUP["UDP"]
         super().__init__(**kwargs)

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

@@ -18,7 +18,7 @@ from primaite.simulator.network.protocols.ssh import (
     SSHTransportMessage,
     SSHUserCredentials,
 )
-from primaite.simulator.system.applications.red_applications.ransomware_script import ransomware_script
+from primaite.simulator.system.applications.red_applications.ransomware_script import RansomwareScript
 from primaite.simulator.system.services.dns.dns_server import DNSServer
 from primaite.simulator.system.services.service import ServiceOperatingState
 from primaite.simulator.system.services.terminal.terminal import RemoteTerminalConnection, Terminal