summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-08-14 16:22:46 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-08-14 16:22:46 +0200
commit5e4d389713bbe56fe55d490d8b31c64c2b4eae02 (patch)
tree9f319dfd9940ed9e1edd323a21ca4e9889f9e1fc /config-provisioning
parent05b5c51b60a1608c6913bc8b0b4cf290879acf25 (diff)
Preserve ABI for now
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java21
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java4
2 files changed, 21 insertions, 4 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
index 4f1effb1380..2bc70efbc15 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
@@ -3,6 +3,8 @@ package com.yahoo.config.provision;
import com.yahoo.config.provisioning.FlavorsConfig;
+import java.util.Collections;
+import java.util.List;
import java.util.Objects;
/**
@@ -85,9 +87,22 @@ public class Flavor {
public String canonicalName() { return name; }
// TODO: Remove after August 2019
- public boolean satisfies(Flavor flavor) {
- return this.equals(flavor);
- }
+ public boolean satisfies(Flavor flavor) { return this.equals(flavor); }
+
+ // TODO: Remove after August 2019
+ public boolean isStock() { return false; }
+
+ // TODO: Remove after August 2019
+ public boolean isRetired() { return false; }
+
+ // TODO: Remove after August 2019
+ public boolean isCanonical() { return false; }
+
+ // TODO: Remove after August 2019
+ public List<Flavor> replaces() { return Collections.emptyList(); }
+
+ // TODO: Remove after August 2019
+ public void freeze() {}
@Override
public int hashCode() { return name.hashCode(); }
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 a05fbb2b92d..8ef48f7048f 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
@@ -64,12 +64,14 @@ public class NodeResources {
combine(this.diskSpeed, other.diskSpeed));
}
- /** Returns the legacy name of this, or empty if none. */
// TODO: Remove after August 2019
public Optional<String> legacyName() {
return Optional.of(toString());
}
+ // TODO: Remove after August 2019
+ public boolean allocateByLegacyName() { return false; }
+
private boolean isInterchangeableWith(NodeResources other) {
if (this.diskSpeed != DiskSpeed.any && other.diskSpeed != DiskSpeed.any && this.diskSpeed != other.diskSpeed)
return false;