diff options
Diffstat (limited to 'node-repository/src/test/java/com')
5 files changed, 16 insertions, 13 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java index 7475a3654b7..91d04ba5ff9 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java @@ -31,7 +31,7 @@ public class SharedLoadBalancerServiceTest { LoadBalancerSpec spec = new LoadBalancerSpec(applicationId, clusterId, reals, ZoneEndpoint.defaultEndpoint, CloudAccount.empty); - var lb = loadBalancerService.configure(loadBalancerService.provision(spec), spec, false); + var lb = loadBalancerService.configure(loadBalancerService.provision(spec, "seed"), spec, false); assertEquals(Optional.of(HostName.of("vip.example.com")), lb.hostname()); assertEquals(Optional.empty(), lb.dnsZone()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializerTest.java index 0d3c1994ad8..c4688f0b3dd 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializerTest.java @@ -39,7 +39,7 @@ public class LoadBalancerSerializerTest { { var loadBalancer = new LoadBalancer(loadBalancerId, Optional.of(new LoadBalancerInstance( - Optional.of("1"), + "1", Optional.of(DomainName.of("lb-host")), Optional.empty(), Optional.empty(), @@ -58,7 +58,7 @@ public class LoadBalancerSerializerTest { LoadBalancer.State.active, now); - var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer)); + var serialized = LoadBalancerSerializer.fromJson(loadBalancer.id(), LoadBalancerSerializer.toJson(loadBalancer)); assertEquals(loadBalancer.id(), serialized.id()); assertEquals(loadBalancer.instance().get().idSeed(), serialized.instance().get().idSeed()); assertEquals(loadBalancer.instance().get().hostname(), serialized.instance().get().hostname()); @@ -75,7 +75,7 @@ public class LoadBalancerSerializerTest { { var loadBalancer = new LoadBalancer(loadBalancerId, Optional.of(new LoadBalancerInstance( - Optional.empty(), + "", Optional.empty(), Optional.of("1.2.3.4"), Optional.of("fd00::1"), @@ -89,7 +89,7 @@ public class LoadBalancerSerializerTest { LoadBalancer.State.active, now); - var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer)); + var serialized = LoadBalancerSerializer.fromJson(loadBalancer.id(), LoadBalancerSerializer.toJson(loadBalancer)); assertEquals(loadBalancer.id(), serialized.id()); assertEquals(loadBalancer.instance().get().idSeed(), serialized.instance().get().idSeed()); assertEquals(loadBalancer.instance().get().hostname(), serialized.instance().get().hostname()); @@ -112,7 +112,7 @@ public class LoadBalancerSerializerTest { var now = Instant.now(); var loadBalancer = new LoadBalancer(loadBalancerId, Optional.empty(), LoadBalancer.State.reserved, now); - var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer)); + var serialized = LoadBalancerSerializer.fromJson(loadBalancerId, LoadBalancerSerializer.toJson(loadBalancer)); assertEquals(loadBalancer.id(), serialized.id()); assertEquals(loadBalancer.instance(), serialized.instance()); assertEquals(loadBalancer.state(), serialized.state()); 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 fb59b3077f8..fce788c7e32 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 @@ -50,6 +50,7 @@ import java.util.SortedSet; import java.util.function.Supplier; import java.util.stream.Collectors; +import static com.yahoo.vespa.hosted.provision.lb.LoadBalancerSpec.preProvisionOwner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertSame; @@ -190,15 +191,15 @@ public class LoadBalancerProvisionerTest { provisioner.refreshPool(); expirer.run(); assertEquals(2, tester.nodeRepository().loadBalancers().list().size()); - assertEquals(2, tester.nodeRepository().loadBalancers().list(LoadBalancerSpec.preProvisionOwner).size()); + assertEquals(2, tester.nodeRepository().loadBalancers().list(preProvisionOwner).size()); // Provision a load balancer when the pool has two entries. ClusterSpec.Id containerCluster = ClusterSpec.Id.from("qrs"); prepare(app1, clusterRequest(ClusterSpec.Type.container, containerCluster)); List<LoadBalancer> loadBalancers = tester.nodeRepository().loadBalancers().list(app1).asList(); assertEquals(1, loadBalancers.size()); - assertEquals(1, tester.nodeRepository().loadBalancers().list(LoadBalancerSpec.preProvisionOwner).asList().size()); - assertEquals(Optional.of("1"), loadBalancers.get(0).instance().get().idSeed()); + assertEquals(1, tester.nodeRepository().loadBalancers().list(preProvisionOwner).asList().size()); + assertEquals(preProvisionOwner.serializedForm() + ":1", loadBalancers.get(0).instance().get().idSeed()); // Shrink pool to 0 entries. flagSource.withIntFlag(PermanentFlags.PRE_PROVISIONED_LB_COUNT.id(), 0); @@ -214,8 +215,8 @@ public class LoadBalancerProvisionerTest { assertThrows(IllegalStateException.class, provisioner::refreshPool).getMessage()); tester.loadBalancerService().throwOnCreate(false); provisioner.refreshPool(); - assertEquals(List.of(Optional.of("3")), - tester.nodeRepository().loadBalancers().list(LoadBalancerSpec.preProvisionOwner) + assertEquals(List.of(preProvisionOwner.serializedForm() + ":3"), + tester.nodeRepository().loadBalancers().list(preProvisionOwner) .mapToList(lb -> lb.instance().get().idSeed())); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers-single.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers-single.json index 620275bb033..bc5a04edc2f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers-single.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers-single.json @@ -7,7 +7,7 @@ "dnsZone": "zone-id-1", "hostname": "lb-hosted-vespa.pre-provision-1", "id": "tenant4:application4:instance4:id4", - "idSeed": "1", + "idSeed": "hosted-vespa:pre-provision:default:1", "instance": "instance4", "networks": [ "10.2.3.0/24", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers.json index e8392d92522..883820634fe 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers.json @@ -7,6 +7,7 @@ "dnsZone": "zone-id-1", "hostname": "lb-tenant1.application1.instance1-id1", "id": "tenant1:application1:instance1:id1", + "idSeed": "tenant1:application1:instance1:id1", "instance": "instance1", "networks": [ "10.2.3.0/24", @@ -47,6 +48,7 @@ "dnsZone": "zone-id-1", "hostname": "lb-hosted-vespa.zone-config-servers-zone-config-servers", "id": "hosted-vespa:zone-config-servers:default:zone-config-servers", + "idSeed": "hosted-vespazone-config-serversdefaultzone-config-servers", "instance": "default", "networks": [ "10.2.3.0/24", @@ -78,7 +80,7 @@ "dnsZone": "zone-id-1", "hostname": "lb-hosted-vespa.pre-provision-1", "id": "tenant4:application4:instance4:id4", - "idSeed": "1", + "idSeed": "hosted-vespa:pre-provision:default:1", "instance": "instance4", "networks": [ "10.2.3.0/24", |