From f4ae08801137aa1942420af265eb03f517d31760 Mon Sep 17 00:00:00 2001 From: ipatini Date: Wed, 1 Mar 2023 16:30:35 +0200 Subject: [PATCH] EMS: Broker Client Install: Added 'baremetal' node type (same as VM) - Copied from RC4.0 --- .../melodic/event/baguette/client/install/ClientInstaller.java | 2 +- .../client/install/helper/InstallationHelperFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/ClientInstaller.java b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/ClientInstaller.java index 77179a287..b92c75c51 100644 --- a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/ClientInstaller.java +++ b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/ClientInstaller.java @@ -64,7 +64,7 @@ public class ClientInstaller implements InitializingBean { if (baguetteServer.getNodeRegistry().getCoordinator()==null) throw new IllegalStateException("Baguette Server Coordinator has not yet been initialized"); - if ("VM".equalsIgnoreCase(task.getType())) { + if ("VM".equalsIgnoreCase(task.getType()) || "baremetal".equalsIgnoreCase(task.getType())) { NodeRegistryEntry entry = baguetteServer.getNodeRegistry().getNodeByAddress(task.getAddress()); if (entry==null) throw new IllegalStateException("Node entry has been removed from Node Registry before installation: Node IP address: "+task.getAddress()); diff --git a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/InstallationHelperFactory.java b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/InstallationHelperFactory.java index f7f5f0f6b..3584bf370 100644 --- a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/InstallationHelperFactory.java +++ b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/InstallationHelperFactory.java @@ -39,7 +39,7 @@ public class InstallationHelperFactory implements InitializingBean { public InstallationHelper createInstallationHelper(NodeRegistryEntry entry) { String nodeType = entry.getPreregistration().get("type"); - if ("VM".equalsIgnoreCase(nodeType)) { + if ("VM".equalsIgnoreCase(nodeType) || "baremetal".equalsIgnoreCase(nodeType)) { return createVmInstallationHelper(entry); } throw new IllegalArgumentException("Unsupported or missing Node type: "+nodeType); -- GitLab