aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-11-13 16:39:06 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2019-11-13 16:39:06 +0100
commitf4651191d1a25bc330cbc44ce7896fa54a8e8d00 (patch)
treeb2b3e6c47203d06fa93dacf36d8c96021bf25c91 /config-model
parent8599007b9367bd6c875d739f0b3ae193b83857fe (diff)
Explicit NodeResources defaults
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
index c0ce5ca22db..54850dedbba 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
@@ -218,7 +218,7 @@ public class NodesSpecification {
}
private static NodeResources.DiskSpeed parseOptionalDiskSpeed(String diskSpeedString) {
- if (diskSpeedString == null) return NodeResources.DiskSpeed.fast;
+ if (diskSpeedString == null) return NodeResources.DiskSpeed.getDefault();
switch (diskSpeedString) {
case "fast" : return NodeResources.DiskSpeed.fast;
case "slow" : return NodeResources.DiskSpeed.slow;
@@ -229,7 +229,7 @@ public class NodesSpecification {
}
private static NodeResources.StorageType parseOptionalStorageType(String storageTypeString) {
- if (storageTypeString == null) return NodeResources.StorageType.any;
+ if (storageTypeString == null) return NodeResources.StorageType.getDefault();
switch (storageTypeString) {
case "remote" : return NodeResources.StorageType.remote;
case "local" : return NodeResources.StorageType.local;