Initial support for per bucket space cluster states in cluster controller

Multiple spaces are only enabled in tests, so the controller still only
generates the legacy baseline cluster state, maintaining today's behavior.

2 files changed, 11 insertions, 0 deletions

diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java b/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java
index a6ede3d4fec..9dab7e46a88 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java
@@ -103,6 +103,9 @@ public class ClusterState implements Cloneable {
     }
 
     private boolean similarToImpl(final ClusterState other, final NodeStateCmp nodeStateCmp) {
+        if (other == this) {
+            return true; // We're definitely similar to ourselves.
+        }
         // Two cluster states are considered similar if they are both down. When clusters
         // are down, their individual node states do not matter to ideal state computations
         // and content nodes therefore do not need to observe them.
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/Node.java b/vdslib/src/main/java/com/yahoo/vdslib/state/Node.java
index 59af0b4eb84..89bdcc53748 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/Node.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/Node.java
@@ -21,6 +21,14 @@ public class Node implements Comparable<Node> {
         index = Integer.valueOf(serialized.substring(dot + 1));
     }
 
+    public static Node ofStorage(int index) {
+        return new Node(NodeType.STORAGE, index);
+    }
+
+    public static Node ofDistributor(int index) {
+        return new Node(NodeType.DISTRIBUTOR, index);
+    }
+
     public String toString() {
         return type.toString() + "." + index;
     }