summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-08-14 14:07:15 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-08-14 14:07:15 +0200
commitec5201a3396ae573e6ace8660c24db18daad7791 (patch)
tree2e6a6a566c8c36375ae55d7a1c5fa00c5fef0930 /config-provisioning
parentc2ebf7f2d9504679f3fbaa273b2a4a46be9fd121 (diff)
Validate legacy node resource strings more
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
index 64389ff8453..a14ab9e432a 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
@@ -182,8 +182,10 @@ public class NodeResources {
public static NodeResources fromLegacyName(String string) {
if ( ! string.startsWith("d-"))
throw new IllegalArgumentException("A node specification string must start by 'd-' but was '" + string + "'");
-
String[] parts = string.split("-");
+ if (parts.length != 4)
+ throw new IllegalArgumentException("A node specification string must contain three numbers separated by '-' but was '" + string + "'");
+
double cpu = Integer.parseInt(parts[1]);
double mem = Integer.parseInt(parts[2]);
double dsk = Integer.parseInt(parts[3]);