From 6b18f9cd70f737e1b18c5ca1f9615f123932538b Mon Sep 17 00:00:00 2001 From: ipatini Date: Thu, 23 Feb 2023 17:07:08 +0200 Subject: [PATCH] EMS: Baguette Client Install, Control Service: Fixed extension for OS info extraction with new Proactive message format --- .../client/install/helper/VmInstallationHelper.java | 4 +--- .../melodic/event/control/ControlServiceController.java | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/VmInstallationHelper.java b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/VmInstallationHelper.java index d5ebe2503..c418fa247 100644 --- a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/VmInstallationHelper.java +++ b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/VmInstallationHelper.java @@ -68,9 +68,7 @@ public class VmInstallationHelper extends AbstractInstallationHelper { // Extract node identification and type information String nodeId = nodeMap.get("id"); - String nodeOs = StringUtils.isNotBlank(nodeMap.get("operatingSystem.name")) - ? nodeMap.get("operatingSystem.name") - : nodeMap.get("operatingSystem"); + String nodeOs = nodeMap.get("operatingSystem"); String nodeAddress = nodeMap.get("address"); String nodeType = nodeMap.get("type"); String nodeName = nodeMap.get("name"); diff --git a/event-management/control-service/src/main/java/eu/melodic/event/control/ControlServiceController.java b/event-management/control-service/src/main/java/eu/melodic/event/control/ControlServiceController.java index 4cd1f445b..96a3e63c1 100644 --- a/event-management/control-service/src/main/java/eu/melodic/event/control/ControlServiceController.java +++ b/event-management/control-service/src/main/java/eu/melodic/event/control/ControlServiceController.java @@ -405,7 +405,7 @@ public class ControlServiceController { return "ERROR "+e.getMessage(); } - // Update client registration info with BASE_URL, IP_SETTING and CLIENT_ID + // Update client registration info with BASE_URL, IP_SETTING, CLIENT_ID and OS info updateRegistrationInfo(request, entry); // Continue processing according to ExecutionWare type @@ -444,6 +444,12 @@ public class ControlServiceController { entry.getPreregistration().put("BASE_URL", baseUrl); entry.getPreregistration().put("CLIENT_ID", clientId); entry.getPreregistration().put("IP_SETTING", ipSetting); + + // Set OS info + String os = StringUtils.isNotBlank(entry.getPreregistration().get("operatingSystem.name")) + ? entry.getPreregistration().get("operatingSystem.name") + : entry.getPreregistration().get("operatingSystem"); + entry.getPreregistration().put("operatingSystem", os); } // Retained for backward compatibility with Cloudiator -- GitLab