From a6aba4e9be5e4bc0118f1436ee1d06ca42e21cd5 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Mon, 18 May 2020 14:24:45 +0200 Subject: Require combinedId for cluster type combined --- .../provision/provisioning/LoadBalancerProvisionerTest.java | 13 ------------- .../hosted/provision/provisioning/ProvisioningTest.java | 5 ++++- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'node-repository') diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java index ad9d13355dc..5654b4000c7 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java @@ -200,19 +200,6 @@ public class LoadBalancerProvisionerTest { assertEquals(List.of(), tester.nodeRepository().loadBalancers(app1).asList()); } - // TODO(mpolden): Remove when ClusterSpec with combined type rejects empty combinedId - @Test - public void provision_load_balancer_combined_cluster_without_id() { - Supplier> lbs = () -> tester.nodeRepository().loadBalancers(app1).asList(); - ClusterSpec.Id cluster = ClusterSpec.Id.from("foo"); - - var nodes = prepare(app1, clusterRequest(ClusterSpec.Type.combined, cluster)); - assertEquals(1, lbs.get().size()); - assertEquals("Prepare provisions load balancer with reserved nodes", 2, lbs.get().get(0).instance().reals().size()); - tester.activate(app1, nodes); - assertSame(LoadBalancer.State.active, lbs.get().get(0).state()); - } - @Test public void provision_load_balancer_combined_cluster() { Supplier> lbs = () -> tester.nodeRepository().loadBalancers(app1).asList(); 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 f8fe0d22e84..bafb52170dc 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 @@ -829,7 +829,10 @@ public class ProvisioningTest { Capacity.from(new ClusterResources(2, 1, defaultResources), false, false))); // Application is redeployed with cluster type combined - cluster = ClusterSpec.request(ClusterSpec.Type.combined, ClusterSpec.Id.from("music")).vespaVersion("1.2.3").build(); + cluster = ClusterSpec.request(ClusterSpec.Type.combined, ClusterSpec.Id.from("music")) + .vespaVersion("1.2.3") + .combinedId(Optional.of(ClusterSpec.Id.from("qrs"))) + .build(); var newNodes = tester.activate(application, tester.prepare(application, cluster, Capacity.from(new ClusterResources(2, 1, defaultResources), false, false))); -- cgit v1.2.3