diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-01-10 10:53:29 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-01-10 10:57:16 +0100 |
| commit | 0e3637dfdd8c7301cefe986c889971efad1f3781 (patch) | |
| tree | cbf9c9a36943e828d365af57ff344358b5339344 /node-repository | |
| parent | bf3076e42f6caecfed14ceff8d637b5a2ead20f5 (diff) | |
Remove unnecessary content/combined substitution
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java index f2c9c409fdb..8fde8cae399 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java @@ -651,35 +651,6 @@ public class ProvisioningTest { tester.activate(application, state.allHosts); } - @Test - public void change_to_combined_cluster_does_not_change_node_allocation() { - var tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build(); - var application = tester.makeApplicationId(); - - tester.makeReadyNodes(4, defaultResources); - - // Application allocates two content nodes initially. This is the old behaviour where combined clusters has type - // content - ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, - ClusterSpec.Id.from("combined"), - Version.fromString("1.2.3"), - false); - var initialNodes = tester.activate(application, tester.prepare(application, cluster, - Capacity.fromCount(2, defaultResources, false, false), - 1)); - - // Application is redeployed with cluster type combined - cluster = ClusterSpec.request(ClusterSpec.Type.combined, - ClusterSpec.Id.from("combined"), - Version.fromString("1.2.3"), - false); - var newNodes = tester.activate(application, tester.prepare(application, cluster, - Capacity.fromCount(2, defaultResources, false, false), - 1)); - - assertEquals("Node allocation remains the same", initialNodes, newNodes); - } - private SystemState prepare(ApplicationId application, int container0Size, int container1Size, int content0Size, int content1Size, NodeResources flavor, ProvisioningTester tester) { return prepare(application, container0Size, container1Size, content0Size, content1Size, flavor, |