Return ClusterMembership instead of ClusterSpec.

2 files changed, 4 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
index a1cef1af863..d54dc912da6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
@@ -246,16 +246,15 @@ public class HostResource implements Comparable<HostResource> {
      * Content clusters are preferred, then container clusters, and finally admin clusters.
      * If there is more than one cluster of the preferred type, the cluster that was added first will be chosen.
      */
-    public Optional<ClusterSpec> primaryClusterMembership() {
+    public Optional<ClusterMembership> primaryClusterMembership() {
         return clusterMemberships().stream()
-                .map(ClusterMembership::cluster)
                 .sorted(HostResource::compareClusters)
                 .findFirst();
     }
 
-    private static int compareClusters(ClusterSpec cluster1, ClusterSpec cluster2) {
+    private static int compareClusters(ClusterMembership cluster1, ClusterMembership cluster2) {
         // This depends on the declared order of enum constants.
-        return cluster2.type().compareTo(cluster1.type());
+        return cluster2.cluster().type().compareTo(cluster1.cluster().type());
     }
 
     @Override
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
index ecfbf8cd96c..16c63bc5251 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
@@ -135,7 +135,7 @@ public class HostResourceTest {
     }
 
     private void assertClusterMembership(HostResource host, ClusterSpec.Type type, String id) {
-        ClusterSpec membership = host.primaryClusterMembership()
+        ClusterSpec membership = host.primaryClusterMembership().map(ClusterMembership::cluster)
                 .orElseThrow(() -> new RuntimeException("No cluster membership!"));
 
         assertEquals(type, membership.type());