diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-17 11:13:51 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-17 11:13:51 +0200 |
| commit | 15c2736314ff5c94a695124ab271f1e046060029 (patch) | |
| tree | 7714fc64b73ff7576c544237b16372f84a815fc6 /config-provisioning | |
| parent | ec278bedb5a787309d11d356018ad5e2afc0862a (diff) | |
Refactor: Skew computation independent of node prioritization
Diffstat (limited to 'config-provisioning')
| -rw-r--r-- | config-provisioning/abi-spec.json | 1 | ||||
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index 32fb870150e..4e50d31d74a 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -617,6 +617,7 @@ "public com.yahoo.config.provision.NodeResources withDiskGb(double)", "public com.yahoo.config.provision.NodeResources withBandwidthGbps(double)", "public com.yahoo.config.provision.NodeResources withDiskSpeed(com.yahoo.config.provision.NodeResources$DiskSpeed)", + "public com.yahoo.config.provision.NodeResources anySpeed()", "public com.yahoo.config.provision.NodeResources subtract(com.yahoo.config.provision.NodeResources)", "public com.yahoo.config.provision.NodeResources add(com.yahoo.config.provision.NodeResources)", "public boolean equals(java.lang.Object)", 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 5687697aff9..66baecf6c82 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 @@ -88,6 +88,11 @@ public class NodeResources { return new NodeResources(vcpu, memoryGb, diskGb, bandwidthGbps, speed); } + /** A shorthand for withDiskSpeed(NodeResources.DiskSpeed.any) */ + public NodeResources anySpeed() { + return withDiskSpeed(NodeResources.DiskSpeed.any); + } + public NodeResources subtract(NodeResources other) { if ( ! this.isInterchangeableWith(other)) throw new IllegalArgumentException(this + " and " + other + " are not interchangeable"); |