summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-08-19 17:23:36 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-08-19 17:23:36 +0200
commit27106bb4a50f319a1d2d7418eef730e7b012dde2 (patch)
tree19caf3ea7db2eb1308034f13b003af26893bcfc8 /config-provisioning
parent9e71fc626233f0989c34b10b9fc81f1db66cdfd3 (diff)
Add toSlime
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java1
-rw-r--r--config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java5
2 files changed, 4 insertions, 2 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java
index db5f0ca94ed..54c8e6c6ccf 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java
@@ -104,6 +104,7 @@ public class AllocatedHostsSerializer {
resourcesObject.setDouble(vcpuKey, resources.vcpu());
resourcesObject.setDouble(memoryKey, resources.memoryGb());
resourcesObject.setDouble(diskKey, resources.diskGb());
+ resourcesObject.setDouble(bandwidthKey, resources.bandwidthMbps());
resourcesObject.setString(diskSpeedKey, diskSpeedToString(resources.diskSpeed()));
}
}
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
index 44aa6ed59b5..19a56c5fcd5 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
@@ -30,7 +30,7 @@ public class AllocatedHostsSerializerTest {
@Test
public void testAllocatedHostsSerialization() throws IOException {
- NodeFlavors configuredFlavors = configuredFlavorsFrom("C/12/45/100", 12, 45, 100, Flavor.Type.BARE_METAL);
+ NodeFlavors configuredFlavors = configuredFlavorsFrom("C/12/45/100", 12, 45, 100, 50, Flavor.Type.BARE_METAL);
Set<HostSpec> hosts = new LinkedHashSet<>();
hosts.add(new HostSpec("empty",
@@ -77,13 +77,14 @@ public class AllocatedHostsSerializerTest {
throw new IllegalArgumentException("No host " + hostname + " is present");
}
- private NodeFlavors configuredFlavorsFrom(String flavorName, double cpu, double mem, double disk, Flavor.Type type) {
+ private NodeFlavors configuredFlavorsFrom(String flavorName, double cpu, double mem, double disk, double bandwidth, Flavor.Type type) {
FlavorsConfig.Builder b = new FlavorsConfig.Builder();
FlavorsConfig.Flavor.Builder flavor = new FlavorsConfig.Flavor.Builder();
flavor.name(flavorName);
flavor.minDiskAvailableGb(disk);
flavor.minCpuCores(cpu);
flavor.minMainMemoryAvailableGb(mem);
+ flavor.bandwidth(bandwidth);
flavor.environment(type.name());
b.flavor(flavor);
return new NodeFlavors(b.build());