From 1e9c81f16bce38f8ac3fa1c3ff11aca38eb9356e Mon Sep 17 00:00:00 2001 From: Rudi Schlatte Date: Tue, 13 Feb 2024 15:36:42 +0100 Subject: [PATCH] Actually listen for solution messages. Change-Id: I71563b321870fdb558f3f663e7d86ec609750f55 --- .../optimiser/controller/ExnConnector.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/ExnConnector.java b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/ExnConnector.java index 09ce174..be44c3d 100644 --- a/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/ExnConnector.java +++ b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/ExnConnector.java @@ -45,8 +45,11 @@ public class ExnConnector { private static final ObjectMapper mapper = new ObjectMapper(); - /** The topic where we listen for app creation messages */ - public static final String app_creation_channel = "eu.nebulouscloud.ui.dsl.generic.>"; + /** The topic where we listen for app creation messages. */ + public static final String app_creation_channel = "eu.nebulouscloud.ui.dsl.generic"; + /** The topic with incoming solver solution messages. See + * https://openproject.nebulouscloud.eu/projects/nebulous-collaboration-hub/wiki/2-solvers */ + public static final String solver_solution_channel = "eu.nebulouscloud.optimiser.solver.solution"; /** The topic where we send AMPL messages */ // 1 object with key: filename, value: AMPL file (serialized) public static final String ampl_message_channel = "eu.nebulouscloud.optimiser.solver.model"; @@ -104,7 +107,11 @@ public class ExnConnector { // List.of(new Publisher("config", "config", true)), List.of(amplMessagePublisher, createJob, findNodeCandidates, addNodes, submitJob), - List.of(new Consumer("ui_app_messages", app_creation_channel, new AppCreationMessageHandler(), true, true)), + List.of( + new Consumer("ui_app_messages", app_creation_channel, + new AppCreationMessageHandler(), true, true), + new Consumer("solver_solution_messages", solver_solution_channel, + new SolverSolutionMessageHandler(), true, true)), true, true, new StaticExnConfig(host, port, name, password, 15, "eu.nebulouscloud"));