nebulous/optimiser-controller
Code Issues Proposed changes

Send raw message, activate health status messages

Browse Source 
Change-Id: If7727b70b9f25ee301617b028e1bd12d5028e752
This commit is contained in:
Rudi Schlatte
2024-01-30 13:33:16 +01:00
parent 9cbab364cb
commit fd719d4e1f
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/ExnConnector.java
View File

@@ -73,8 +73,8 @@ public class ExnConnector {
// List.of(new Publisher("config", "config", true)),
List.of(amplMessagePublisher),
List.of(new Consumer("ui_app_messages", app_creation_channel, new AppCreationMessageHandler(), true, true)),
false,
false,
true,
true,
new StaticExnConfig(host, port, name, password, 15, "eu.nebulouscloud"));
}

26
optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousApp.java
View File

@@ -1,6 +1,8 @@
package eu.nebulouscloud.optimiser.controller;
import com.fasterxml.jackson.core.JsonPointer;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -12,6 +14,11 @@ import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -205,7 +212,7 @@ public class NebulousApp {
return null;
} else {
return new NebulousApp(app_message,
(ObjectNode)yaml_mapper.readTree(kubevela_string),
(ObjectNode)readKubevelaString(kubevela_string),
ampl_message_channel);
}
} catch (Exception e) {
@@ -214,6 +221,19 @@ public class NebulousApp {
}
}
/** Utility function to parse a KubeVela string. Can be used from jshell. */
public static JsonNode readKubevelaString(String kubevela) throws JsonMappingException, JsonProcessingException {
return yaml_mapper.readTree(kubevela);
}
/** Utility function to parse KubeVela from a file. Intended for use from jshell.
* @throws IOException
* @throws JsonProcessingException
* @throws JsonMappingException */
public static JsonNode readKubevelaFile(String path) throws JsonMappingException, JsonProcessingException, IOException {
return readKubevelaString(Files.readString(Path.of(path), StandardCharsets.UTF_8));
}
/**
* Set "deployed" status. Will typically be set to true once, and then
* never to false again.
@@ -336,10 +356,10 @@ public class NebulousApp {
}
String ampl = AMPLGenerator.generateAMPL(this);
ObjectNode msg = mapper.createObjectNode();
msg.put("FileName", getUUID() + ".ampl"); // TODO: check if filename needs to be unique
msg.put("FileName", getUUID() + ".ampl"); // TODO: check with Geir if filename needs to be unique
msg.put("FileContent", ampl);
msg.put("ObjectiveFunction", getObjectiveFunction());
ampl_message_channel.send(mapper.convertValue(msg, Map.class), getUUID());
ampl_message_channel.send(mapper.convertValue(msg, Map.class), getUUID(), true);
Main.logFile(getUUID() + "to-solver.json", msg.toString());
Main.logFile(getUUID() + ".ampl", ampl);
}