diff options
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision')
3 files changed, 4 insertions, 54 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java index 5204da08307..6df617ea335 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java @@ -65,12 +65,6 @@ public final class Capacity { return fromNodeCount(capacity, Optional.empty(), false, true); } - // TODO: Remove after July 2018 - @Deprecated - public static Capacity fromNodeCount(int nodeCount, Optional<String> flavor, boolean required) { - return new Capacity(nodeCount, flavor, required, true, NodeType.tenant); - } - public static Capacity fromNodeCount(int nodeCount, Optional<String> flavor, boolean required, boolean canFail) { return new Capacity(nodeCount, flavor, required, canFail, NodeType.tenant); } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/InstanceName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/InstanceName.java index 0f1b298ba83..703528e5d33 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/InstanceName.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/InstanceName.java @@ -46,6 +46,10 @@ public class InstanceName implements Comparable<InstanceName> { return equals(InstanceName.defaultName()); } + public boolean isTester() { + return value().endsWith("-t"); + } + public String value() { return instanceName; } @Override diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java deleted file mode 100644 index ca8d531634b..00000000000 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.config.provision; - -import com.yahoo.slime.ArrayTraverser; -import com.yahoo.slime.Inspector; -import com.yahoo.vespa.config.SlimeUtils; - -import java.util.LinkedHashSet; -import java.util.Optional; -import java.util.Set; - -/** - * @author bratseth - * @deprecated use AllocatedHosts - */ -// TODO: Remove when no version older than 6.143 is in production anywhere -@Deprecated -@SuppressWarnings("unused") -public class ProvisionInfo extends AllocatedHosts { - - private static final String mappingKey = "mapping"; - private static final String hostSpecKey = "hostSpec"; - - private ProvisionInfo(Set<HostSpec> hosts) { - super(hosts); - } - - public static ProvisionInfo withHosts(Set<HostSpec> hosts) { - return new ProvisionInfo(hosts); - } - - public static ProvisionInfo fromJson(byte[] json, Optional<NodeFlavors> nodeFlavors) { - return fromSlime(SlimeUtils.jsonToSlime(json).get(), nodeFlavors); - } - - private static ProvisionInfo fromSlime(Inspector inspector, Optional<NodeFlavors> nodeFlavors) { - Inspector array = inspector.field(mappingKey); - Set<HostSpec> hosts = new LinkedHashSet<>(); - array.traverse(new ArrayTraverser() { - @Override - public void entry(int i, Inspector inspector) { - hosts.add(hostFromSlime(inspector.field(hostSpecKey), nodeFlavors)); - } - }); - return new ProvisionInfo(hosts); - } - -} |