diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-08-19 16:36:56 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-08-19 16:36:56 +0200 |
commit | 9e71fc626233f0989c34b10b9fc81f1db66cdfd3 (patch) | |
tree | 6a0bf6d16ff35054ce94b8d160c2f84c5a925ff8 /config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | |
parent | 5fb8e66dbd2d6e02a64a054e147ac7214943d563 (diff) |
Add bandwidth to NodeResources
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | 6 |
1 files changed, 2 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 2bc70efbc15..fd0fe724809 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 @@ -20,7 +20,6 @@ public class Flavor { private final String name; private final int cost; private final Type type; - private final double bandwidth; /** The hardware resources of this flavor */ private NodeResources resources; @@ -34,8 +33,8 @@ public class Flavor { this.resources = new NodeResources(flavorConfig.minCpuCores(), flavorConfig.minMainMemoryAvailableGb(), flavorConfig.minDiskAvailableGb(), + flavorConfig.bandwidth(), flavorConfig.fastDisk() ? NodeResources.DiskSpeed.fast : NodeResources.DiskSpeed.slow); - this.bandwidth = flavorConfig.bandwidth(); } /** Creates a *node* flavor from a node resources spec */ @@ -45,7 +44,6 @@ public class Flavor { this.name = resources.toString(); this.cost = 0; this.type = Type.DOCKER_CONTAINER; - this.bandwidth = 1; this.resources = resources; } @@ -74,7 +72,7 @@ public class Flavor { public boolean hasFastDisk() { return resources.diskSpeed() == NodeResources.DiskSpeed.fast; } - public double getBandwidth() { return bandwidth; } + public double getBandwidth() { return resources.bandwidthMbps(); } public double getMinCpuCores() { return resources.vcpu(); } |