Disallow cfg suspension based solely on being down

1 files changed, 9 insertions, 1 deletions

diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java
index f7398d0478f..b4a0c3bd578 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java
@@ -113,6 +113,14 @@ public class ServiceCluster {
     }
 
     public String nodeDescription(boolean plural) {
+        return entityDescription("node", plural);
+    }
+
+    public String serviceDescription(boolean plural) {
+        return entityDescription("service", plural);
+    }
+
+    private String entityDescription(String entity, boolean plural) {
         String pluralSuffix = plural ? "s" : "";
         return isConfigServer() ? "config server" + pluralSuffix :
                isConfigServerHost() ? "config server host" + pluralSuffix :
@@ -121,7 +129,7 @@ public class ServiceCluster {
                isProxy() ? (plural ? "proxies" : "proxy") :
                isProxyHost() ? "proxy host" + pluralSuffix :
                isTenantHost() ? "tenant host" + pluralSuffix :
-               "node" + pluralSuffix + " of {" + serviceType + "," + clusterId + "}";
+               entity + pluralSuffix + " of {" + serviceType + "," + clusterId + "}";
     }
 
     private boolean isHostedVespaApplicationWithId(ApplicationInstanceId id) {