#2888: Fix merge test failures.

src/primaite/game/game.py

@@ -376,7 +376,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, **service_cfg.get("options", {}))
+                        new_node.software_manager.install(service_class)
                         new_service = new_node.software_manager.software[service_class.__name__]
 
                         # fixing duration for the service

src/primaite/simulator/system/services/database/database_service.py

@@ -30,6 +30,7 @@ class DatabaseService(Service, identifier="DatabaseService"):
         """ConfigSchema for DatabaseService."""
 
         type: str = "DatabaseService"
+        backup_server_ip: Optional[IPv4Address] = None
 
     config: "DatabaseService.ConfigSchema" = Field(default_factory=lambda: DatabaseService.ConfigSchema())
 
@@ -51,6 +52,7 @@ class DatabaseService(Service, identifier="DatabaseService"):
         kwargs["protocol"] = PROTOCOL_LOOKUP["TCP"]
         super().__init__(**kwargs)
         self._create_db_file()
+        self.backup_server_ip = self.config.backup_server_ip
 
     def install(self):
         """

src/primaite/simulator/system/services/dns/dns_server.py

@@ -21,6 +21,7 @@ class DNSServer(Service, identifier="DNSServer"):
         """ConfigSchema for DNSServer."""
 
         type: str = "DNSServer"
+        domain_mapping: dict = {}
 
     config: "DNSServer.ConfigSchema" = Field(default_factory=lambda: DNSServer.ConfigSchema())