Support an ID seed for LB resource ID hashes

2 files changed, 29 insertions, 23 deletions

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 17bb7502484..146b9df1722 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
@@ -20,6 +20,7 @@ import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 
 import static java.time.temporal.ChronoUnit.MILLIS;
 import static org.junit.Assert.assertEquals;
@@ -38,6 +39,7 @@ public class LoadBalancerSerializerTest {
         {
             var loadBalancer = new LoadBalancer(loadBalancerId,
                                                 Optional.of(new LoadBalancerInstance(
+                                                        Optional.of(UUID.randomUUID()),
                                                         Optional.of(DomainName.of("lb-host")),
                                                         Optional.empty(),
                                                         Optional.empty(),
@@ -58,6 +60,7 @@ public class LoadBalancerSerializerTest {
 
             var serialized = LoadBalancerSerializer.fromJson(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());
             assertEquals(loadBalancer.instance().get().dnsZone(), serialized.instance().get().dnsZone());
             assertEquals(loadBalancer.instance().get().ports(), serialized.instance().get().ports());
@@ -73,6 +76,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"),
                                                         Optional.of(new DnsZone("zone-id-1")),
@@ -87,6 +91,7 @@ public class LoadBalancerSerializerTest {
 
             var serialized = LoadBalancerSerializer.fromJson(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());
             assertEquals(loadBalancer.instance().get().ip4Address(), serialized.instance().get().ip4Address());
             assertEquals(loadBalancer.instance().get().ip6Address(), serialized.instance().get().ip6Address());
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 96213dea0a7..e0c370fc376 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
@@ -1,15 +1,13 @@
 {
   "loadBalancers": [
     {
-      "id": "tenant1:application1:instance1:id1",
-      "state": "active",
-      "changedAt": 123,
       "application": "application1",
-      "tenant": "tenant1",
-      "instance": "instance1",
+      "changedAt": 123,
       "cluster": "id1",
-      "hostname": "lb-tenant1.application1.instance1-id1",
       "dnsZone": "zone-id-1",
+      "hostname": "lb-tenant1.application1.instance1-id1",
+      "id": "tenant1:application1:instance1:id1",
+      "instance": "instance1",
       "networks": [
         "10.2.3.0/24",
         "10.4.5.0/24"
@@ -17,6 +15,7 @@
       "ports": [
         4443
       ],
+      "public": false,
       "reals": [
         {
           "hostname": "host1.yahoo.com",
@@ -29,6 +28,7 @@
           "port": 4443
         }
       ],
+      "serviceId": "service",
       "settings": {
         "allowedUrns": [
           {
@@ -37,19 +37,18 @@
           }
         ]
       },
-      "serviceId": "service",
-      "public": false
+      "state": "active",
+      "tenant": "tenant1"
     },
     {
-      "id": "hosted-vespa:zone-config-servers:default:zone-config-servers",
-      "state": "active",
-      "changedAt": 123,
       "application": "zone-config-servers",
-      "tenant": "hosted-vespa",
-      "instance": "default",
+      "changedAt": 123,
       "cluster": "zone-config-servers",
-      "hostname": "lb-hosted-vespa.zone-config-servers-zone-config-servers",
       "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": "c11272ab-d20e-4c86-b808-ffedaa00c480",
+      "instance": "default",
       "networks": [
         "10.2.3.0/24",
         "10.4.5.0/24"
@@ -57,6 +56,7 @@
       "ports": [
         4443
       ],
+      "public": true,
       "reals": [
         {
           "hostname": "cfg1.yahoo.com",
@@ -69,18 +69,17 @@
           "port": 4443
         }
       ],
-      "public": true
+      "state": "active",
+      "tenant": "hosted-vespa"
     },
     {
-      "id": "tenant4:application4:instance4:id4",
-      "state": "active",
-      "changedAt": 123,
       "application": "application4",
-      "tenant": "tenant4",
-      "instance": "instance4",
+      "changedAt": 123,
       "cluster": "id4",
-      "hostname": "lb-tenant4.application4.instance4-id4",
       "dnsZone": "zone-id-1",
+      "hostname": "lb-tenant4.application4.instance4-id4",
+      "id": "tenant4:application4:instance4:id4",
+      "instance": "instance4",
       "networks": [
         "10.2.3.0/24",
         "10.4.5.0/24"
@@ -88,6 +87,7 @@
       "ports": [
         4443
       ],
+      "public": true,
       "reals": [
         {
           "hostname": "host13.yahoo.com",
@@ -100,7 +100,8 @@
           "port": 4443
         }
       ],
-      "public": true
+      "state": "active",
+      "tenant": "tenant4"
     }
   ]
-}
+}
\ No newline at end of file