Retire if there are shared hosts dedicated to cluster type

1 files changed, 9 insertions, 2 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/custom/SharedHost.java b/flags/src/main/java/com/yahoo/vespa/flags/custom/SharedHost.java
index 3f6b20ccfa4..66356d979a4 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/custom/SharedHost.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/custom/SharedHost.java
@@ -41,9 +41,16 @@ public class SharedHost {
         return resources.isEmpty() ? null : resources;
     }
 
+    /** Whether there are any shared hosts specifically for the given cluster type, or without a cluster type restriction. */
     @JsonIgnore
-    public boolean isEnabled(String clusterType) {
-        return resources.stream().anyMatch(hr -> hr.satisfiesClusterType(clusterType));
+    public boolean supportsClusterType(String clusterType) {
+        return resources.stream().anyMatch(resource -> resource.clusterType().map(clusterType::equalsIgnoreCase).orElse(true));
+    }
+
+    /** Whether there are any shared hosts specifically for the given cluster type. */
+    @JsonIgnore
+    public boolean hasClusterType(String clusterType) {
+        return resources.stream().anyMatch(resource -> resource.clusterType().map(clusterType::equalsIgnoreCase).orElse(false));
     }
 
     @JsonIgnore