Add isCd method to SystemName

3 files changed, 7 insertions, 3 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 2050721fef1..f14a0fe32d9 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -780,6 +780,7 @@
       "public static com.yahoo.config.provision.SystemName defaultSystem()",
       "public static com.yahoo.config.provision.SystemName from(java.lang.String)",
       "public java.lang.String value()",
+      "public boolean isCd()",
       "public static java.util.Set all()"
     ],
     "fields": [
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
index a2d690b3a67..0206e6f6734 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
@@ -2,6 +2,7 @@
 package com.yahoo.config.provision;
 
 import java.util.EnumSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -57,6 +58,10 @@ public enum SystemName {
         }
     }
 
+    public boolean isCd() {
+        return List.of(cd, PublicCd).contains(this);
+    }
+
     public static Set<SystemName> all() {
         return EnumSet.allOf(SystemName.class);
     }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 3fbe5b209ec..a200ff9a805 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.node.admin.nodeagent;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.Environment;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.flags.DoubleFlag;
@@ -376,8 +375,7 @@ public class NodeAgentImpl implements NodeAgent {
 
     private boolean noCpuCap(ZoneId zoneId) {
         return zoneId.environment() == Environment.dev
-                // TODO: Add other cd systems, not ideal when having just SystemName here
-                || (zoneId.system() == SystemName.cd && zoneId.environment() != Environment.prod);
+                || (zoneId.system().isCd() && zoneId.environment() != Environment.prod);
     }
 
     private void scheduleDownLoadIfNeeded(NodeSpec node, Optional<Container> container) {