From 7437a17c9f39f70e34af4db215d312a05001d2aa Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Wed, 5 Mar 2025 10:24:40 +0100 Subject: [PATCH] Moved missed condition. --- .../src/org/jdrupes/vmoperator/common/Constants.java | 6 +++--- .../org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/Constants.java b/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/Constants.java index c011a24..83b261e 100644 --- a/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/Constants.java +++ b/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/Constants.java @@ -75,13 +75,13 @@ public class Constants { /** The Constant ASSIGNMENT. */ public static final String ASSIGNMENT = "assignment"; - /** The Constant COND_RUNNING. */ - public static final String COND_RUNNING = "Running"; - /** * Conditions used in Status. */ public static class Condition { + /** The Constant COND_RUNNING. */ + public static final String RUNNING = "Running"; + /** The Constant COND_BOOTED. */ public static final String BOOTED = "Booted"; diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java index d9c32c4..b1580ae 100644 --- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java +++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java @@ -174,7 +174,7 @@ public class StatusUpdater extends VmDefUpdater { } status.getAsJsonArray("conditions").asList().stream() .map(cond -> (JsonObject) cond) - .filter(cond -> Status.COND_RUNNING + .filter(cond -> Condition.RUNNING .equals(cond.get("type").getAsString())) .forEach(cond -> cond.addProperty("observedGeneration", from.getMetadata().getGeneration())); @@ -200,7 +200,7 @@ public class StatusUpdater extends VmDefUpdater { } vmStub.updateStatus(from -> { boolean running = event.runState().vmRunning(); - updateCondition(vmDef, Status.COND_RUNNING, running, event.reason(), + updateCondition(vmDef, Condition.RUNNING, running, event.reason(), event.message()); JsonObject status = updateCondition(vmDef, Condition.BOOTED, event.runState() == RunState.BOOTED, event.reason(),