summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@pvv.ntnu.no>2018-09-28 16:13:35 +0200
committerolaaun <ola.aunroe@gmail.com>2018-09-28 16:13:35 +0200
commit3d74ee9620abd934e84c9482dd4ff10090d1e4dd (patch)
tree88258c1d957c00c349593cb596aac8fa831a9d26 /config-provisioning
parente6f46440bd697d78921379dba4f7e55ca2d85c7a (diff)
andreer/flavor bandwidth (#7141)
* add bandwidth to flavor * accept having more disk / memory than expected * add bandwidth to node-admin bindings * add bandwidth to test * fix test * disable ping check (and assume ipv6 connectivity) check has been deemed too unreliable to rely on for failing out nodes * add bandwidth field to expected responses
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java4
-rw-r--r--config-provisioning/src/main/resources/configdefinitions/flavors.def5
2 files changed, 8 insertions, 1 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 78507779585..79a17c23dd7 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
@@ -23,6 +23,7 @@ public class Flavor {
private final double minMainMemoryAvailableGb;
private final double minDiskAvailableGb;
private final boolean fastDisk;
+ private final double bandwidth;
private final String description;
private final boolean retired;
private List<Flavor> replacesFlavors;
@@ -42,6 +43,7 @@ public class Flavor {
this.minMainMemoryAvailableGb = flavorConfig.minMainMemoryAvailableGb();
this.minDiskAvailableGb = flavorConfig.minDiskAvailableGb();
this.fastDisk = flavorConfig.fastDisk();
+ this.bandwidth = flavorConfig.bandwidth();
this.description = flavorConfig.description();
this.retired = flavorConfig.retired();
this.idealHeadroom = flavorConfig.idealHeadroom();
@@ -66,6 +68,8 @@ public class Flavor {
public boolean hasFastDisk() { return fastDisk; }
+ public double getBandwidth() { return bandwidth; }
+
public double getMinCpuCores() { return minCpuCores; }
public String getDescription() { return description; }
diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def
index 63b22958487..1e40f6f8f36 100644
--- a/config-provisioning/src/main/resources/configdefinitions/flavors.def
+++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def
@@ -14,7 +14,7 @@ flavor[].name string
# c may be satisfied by assigning nodes of flavor a.
flavor[].replaces[].name string
-# The monthly Total Cost of Ownership (TCO) in USD. Typically calculated as TCO divered by
+# The monthly Total Cost of Ownership (TCO) in USD. Typically calculated as TCO divided by
# the expected lifetime of the node (usually three years).
flavor[].cost int default=0
@@ -40,6 +40,9 @@ flavor[].minDiskAvailableGb double default=0.0
# Whether the disk is fast (typically SSD) or slow (typically spinning HDD).
flavor[].fastDisk bool default=true
+# Expected network interface bandwidth available for this flavor, in Mbit/s.
+flavor[].bandwidth double default=0.0
+
# Human readable free text for description of node.
flavor[].description string default=""