From cad2388c8b0aa77038e9c1e4faa4958ae1ed773d Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 20 Mar 2020 01:00:17 +0100 Subject: Revert "Bratseth/nicer autoscaling logging" --- .../com/yahoo/config/provision/NodeResources.java | 9 ++++----- .../yahoo/config/provision/NodeResourcesTest.java | 21 --------------------- 2 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java (limited to 'config-provisioning') 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 6399352a6ec..cd3d08b072a 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,11 +191,10 @@ public class NodeResources { @Override public String toString() { - 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); + return "[vcpu: " + vcpu + ", memory: " + memoryGb + " Gb, disk " + diskGb + " Gb" + + (bandwidthGbps > 0 ? ", bandwidth: " + bandwidthGbps + " Gbps" : "") + + ( ! diskSpeed.isDefault() ? ", disk speed: " + diskSpeed : "") + + ( ! storageType.isDefault() ? ", storage type: " + storageType : "") + "]"; } /** 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 deleted file mode 100644 index cb85a725189..00000000000 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java +++ /dev/null @@ -1,21 +0,0 @@ -// 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.30 Gbps]", - new NodeResources(1/3., 10/3., 100/3., 0.3).toString()); - } - -} -- cgit v1.2.3