Merge pull request #12640 from vespa-engine/bratseth/nicer-autoscaling-logging-take-2

Bratseth/nicer autoscaling logging take 2.

2 files changed, 26 insertions, 4 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
index cd3d08b072a..6399352a6ec 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
@@ -191,10 +191,11 @@ public class NodeResources {
 
     @Override
     public String toString() {
-        return "[vcpu: " + vcpu + ", memory: " + memoryGb + " Gb, disk " + diskGb + " Gb" +
-               (bandwidthGbps > 0 ? ", bandwidth: " + bandwidthGbps + " Gbps" : "") +
-               ( ! diskSpeed.isDefault() ? ", disk speed: " + diskSpeed : "") +
-               ( ! storageType.isDefault() ? ", storage type: " + storageType : "") + "]";
+        return String.format("[vcpu: %1$.1f, memory: %2$.1f Gb, disk %3$.1f Gb" +
+                            (bandwidthGbps > 0 ? ", bandwidth: %4$.1f Gbps" : "") +
+                            ( ! diskSpeed.isDefault() ? ", disk speed: " + diskSpeed : "") +
+                            ( ! storageType.isDefault() ? ", storage type: " + storageType : "") + "]",
+                            vcpu, memoryGb, diskGb, bandwidthGbps);
     }
 
     /** Returns true if all the resources of this are the same or larger than the given resources */
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java
new file mode 100644
index 00000000000..21e1afeed17
--- /dev/null
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java
@@ -0,0 +1,21 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.config.provision;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author bratseth
+ */
+public class NodeResourcesTest {
+
+    @Test
+    public void testToString() {
+        assertEquals("[vcpu: 1.0, memory: 10.0 Gb, disk 100.0 Gb]",
+                     new NodeResources(1., 10., 100., 0).toString());
+        assertEquals("[vcpu: 0.3, memory: 3.3 Gb, disk 33.3 Gb, bandwidth: 0.3 Gbps]",
+                     new NodeResources(1/3., 10/3., 100/3., 0.3).toString());
+    }
+
+}