Merge pull request #10527 from vespa-engine/freva/fix-todos

Fix bandwidth and Flavor TODOs

1 files changed, 1 insertions, 6 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index 5468ab46b63..0726ff61fdd 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -242,15 +242,10 @@ public class NodeSerializer {
             return flavor.with(FlavorOverrides.ofDisk(resources.field(diskKey).asDouble()));
         }
         else {
-            // TODO: Simplify Sept. 2019
-            double bandwidth = Optional.of(resources.field(bandwidthKey))
-                    .filter(Inspector::valid)
-                    .map(Inspector::asDouble)
-                    .orElse(0.3);
             return new Flavor(new NodeResources(resources.field(vcpuKey).asDouble(),
                                                 resources.field(memoryKey).asDouble(),
                                                 resources.field(diskKey).asDouble(),
-                                                bandwidth,
+                                                resources.field(bandwidthKey).asDouble(),
                                                 diskSpeedFromSlime(resources.field(diskSpeedKey))));
         }
     }