flavor -> nodeResources
@@ -9,10 +9,10 @@ import com.yahoo.config.provision.ClusterMembership;
import com.yahoo.config.provision.ClusterSpec;
import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.Flavor;
-import com.yahoo.config.provision.NodeResources;
import com.yahoo.config.provision.HostFilter;
import com.yahoo.config.provision.HostSpec;
import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.NodeResources;
import com.yahoo.config.provision.NodeType;
import com.yahoo.config.provision.OutOfCapacityException;
import com.yahoo.config.provision.RegionName;
@@ -819,13 +819,13 @@ public class ProvisioningTest {
}
private SystemState prepare(ApplicationId application, int container0Size, int container1Size, int content0Size,
- int content1Size, NodeResources flavor, Version wantedVersion, ProvisioningTester tester) {
- return prepare(application, container0Size, container1Size, content0Size, content1Size, false, flavor,
+ int content1Size, NodeResources nodeResources, Version wantedVersion, ProvisioningTester tester) {
+ return prepare(application, container0Size, container1Size, content0Size, content1Size, false, nodeResources,
wantedVersion, tester);
}
private SystemState prepare(ApplicationId application, int container0Size, int container1Size, int content0Size,
- int content1Size, boolean required, NodeResources flavor, Version wantedVersion,
+ int content1Size, boolean required, NodeResources nodeResources, Version wantedVersion,
ProvisioningTester tester) {
// "deploy prepare" with a two container clusters and a storage cluster having of two groups
ClusterSpec containerCluster0 = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("container0"), wantedVersion, false);
@@ -833,10 +833,10 @@ public class ProvisioningTest {
ClusterSpec contentCluster0 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("content0"), wantedVersion, false);
ClusterSpec contentCluster1 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("content1"), wantedVersion, false);
- Set<HostSpec> container0 = prepare(application, containerCluster0, container0Size, 1, required, flavor, tester);
- Set<HostSpec> container1 = prepare(application, containerCluster1, container1Size, 1, required, flavor, tester);
- Set<HostSpec> content0 = prepare(application, contentCluster0, content0Size, 1, required, flavor, tester);
- Set<HostSpec> content1 = prepare(application, contentCluster1, content1Size, 1, required, flavor, tester);
+ Set<HostSpec> container0 = prepare(application, containerCluster0, container0Size, 1, required, nodeResources, tester);
+ Set<HostSpec> container1 = prepare(application, containerCluster1, container1Size, 1, required, nodeResources, tester);
+ Set<HostSpec> content0 = prepare(application, contentCluster0, content0Size, 1, required, nodeResources, tester);
+ Set<HostSpec> content1 = prepare(application, contentCluster1, content1Size, 1, required, nodeResources, tester);
Set<HostSpec> allHosts = new HashSet<>();
allHosts.addAll(container0);
@@ -868,9 +868,9 @@ public class ProvisioningTest {
}
private Set<HostSpec> prepare(ApplicationId application, ClusterSpec cluster, int nodeCount, int groups,
- boolean required, NodeResources flavor, ProvisioningTester tester) {
+ boolean required, NodeResources nodeResources, ProvisioningTester tester) {
if (nodeCount == 0) return Collections.emptySet(); // this is a shady practice
- return new HashSet<>(tester.prepare(application, cluster, nodeCount, groups, required, flavor));
+ return new HashSet<>(tester.prepare(application, cluster, nodeCount, groups, required, nodeResources));
}
private static class SystemState {
