Show info on nearest flavor also with autoscaling

3 files changed, 35 insertions, 0 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
index eb462c86f4f..c3b2bd9f69a 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
@@ -7,6 +7,7 @@ import com.yahoo.config.provisioning.FlavorsConfig;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
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 0548bc7520f..4454517d5ec 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
@@ -280,6 +280,17 @@ public class NodeResources {
 
     public boolean isUnspecified() { return this.equals(unspecified); }
 
+    // Returns squared euclidean distance of the relevant numerical values of two node resources
+    public double distanceTo(NodeResources other) {
+        if ( ! this.diskSpeed().compatibleWith(other.diskSpeed())) return Double.MAX_VALUE;
+        if ( ! this.storageType().compatibleWith(other.storageType())) return Double.MAX_VALUE;
+
+        double distance =  Math.pow(this.vcpu() - other.vcpu(), 2) + Math.pow(this.memoryGb() - other.memoryGb(), 2);
+        if (this.storageType() == StorageType.local || other.storageType() == StorageType.local)
+            distance += Math.pow(this.diskGb() - other.diskGb(), 2);
+        return distance;
+    }
+
     /** Returns this.isUnspecified() ? Optional.empty() : Optional.of(this) */
     public Optional<NodeResources> asOptional() {
         return this.isUnspecified() ? Optional.empty() : Optional.of(this);
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java
new file mode 100644
index 00000000000..3f198400f77
--- /dev/null
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java
@@ -0,0 +1,23 @@
+// 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 ClusterResourcesTest {
+
+    @Test
+    public void testCost() {
+        ClusterResources r1 = new ClusterResources(3, 1, new NodeResources(2,  8, 50, 1));
+        ClusterResources r2 = new ClusterResources(3, 1, new NodeResources(2, 16, 50, 1));
+        System.out.println(r1.cost()*24*30);
+        System.out.println(r2.cost()*24*30);
+        System.out.println((r1.cost()*24*30 + r2.cost()*24*30) * 1.05);
+        assertEquals(1.818, r1.cost() + r2.cost(), 0.01);
+    }
+
+}