Adds classes to give the Orchestrator policy classes a simplified view of Vespa.

This should be a no-op.  The only changes that actually could have an impact
are the changes to getting the cluster controllers, but it should be
functionally equivalent.

This PR will make it easier to change the Orchestrator policy to allow
suspending several nodes (NodeGroup) in an application on a single Docker host.

2 files changed, 10 insertions, 1 deletions

diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java
index d8feec5af3b..570e0d632ed 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java
@@ -33,6 +33,10 @@ public class ApplicationInstanceReference {
     @JsonValue
     @Override
     public String toString() {
+        return asString();
+    }
+
+    public String asString() {
         return tenantId.s() + ":" + applicationInstanceId.s();
     }
 
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java
index 0b1998059f0..6fea6846ec9 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java
@@ -7,7 +7,7 @@ import java.util.Objects;
 /**
  * @author bjorncs
  */
-public class HostName {
+public class HostName implements Comparable<HostName> {
 
     private final String id;
 
@@ -40,4 +40,9 @@ public class HostName {
     public int hashCode() {
         return Objects.hash(id);
     }
+
+    @Override
+    public int compareTo(HostName o) {
+        return id.compareTo(o.id);
+    }
 }