aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@yahooinc.com>2023-09-28 17:02:17 +0200
committerValerij Fredriksen <valerijf@yahooinc.com>2023-09-28 17:02:17 +0200
commitb3bc094a2179a9e5f13702f02ed4a80e751760fa (patch)
tree2f26f1af163fd460620f97af1e10a67059e3f59e /node-repository/src/main/java/com
parent791ab8dc2d9c9febb1ef93977fe990d66434c341 (diff)
Compare advertised resources in flavor satisified check in tests
Diffstat (limited to 'node-repository/src/main/java/com')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
index 5cdb08d6fc6..a72c2fb0b9c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
@@ -79,7 +79,7 @@ public class MockHostProvisioner implements HostProvisioner {
if (hostFlavor == null)
hostFlavor = flavors.stream()
.filter(f -> request.sharing() == HostSharing.exclusive ? compatible(f, request.resources())
- : f.resources().satisfies(request.resources()))
+ : satisfies(f, request.resources()))
.filter(f -> realHostResourcesWithinLimits.test(f.resources()))
.findFirst()
.orElseThrow(() -> new NodeAllocationException("No host flavor matches " + request.resources(), true));
@@ -223,6 +223,10 @@ public class MockHostProvisioner implements HostProvisioner {
return flavor.resources().compatibleWith(resourcesToVerify);
}
+ public boolean satisfies(Flavor flavor, NodeResources resources) {
+ return flavor.resources().satisfies(resources);
+ }
+
private List<HostName> createHostnames(NodeType hostType, Flavor flavor, int hostIndex) {
long numAddresses = Math.max(2, Math.round(flavor.resources().bandwidthGbps()));
return IntStream.range(1, (int) numAddresses)