Merge pull request #29390 from vespa-engine/jonmv/pre-provisioned-lbs-cleanup

Jonmv/pre provisioned lbs cleanup

3 files changed, 6 insertions, 7 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java
index 31d79d34c94..d511570881b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java
@@ -445,7 +445,7 @@ public class CuratorDb {
     }
 
     public Optional<LoadBalancer> readLoadBalancer(LoadBalancerId id) {
-        return read(loadBalancerPath(id), bytes -> LoadBalancerSerializer.fromJson(id, bytes));
+        return read(loadBalancerPath(id), LoadBalancerSerializer::fromJson);
     }
 
     public void writeLoadBalancer(LoadBalancer loadBalancer, LoadBalancer.State fromState) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java
index 99cc0d1e601..c4a2e4cb549 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java
@@ -111,7 +111,7 @@ public class LoadBalancerSerializer {
         }
     }
 
-    public static LoadBalancer fromJson(LoadBalancerId id, byte[] data) {
+    public static LoadBalancer fromJson(byte[] data) {
         Cursor object = SlimeUtils.jsonToSlime(data).get();
 
         Set<Real> reals = new LinkedHashSet<>();
@@ -128,8 +128,7 @@ public class LoadBalancerSerializer {
         Set<String> networks = new LinkedHashSet<>();
         object.field(networksField).traverse((ArrayTraverser) (i, network) -> networks.add(network.asString()));
 
-        // TODO jonmv: remove fallback after data is re-written.
-        String idSeed = SlimeUtils.optionalString(object.field(idSeedField)).orElse(id.application().tenant().value() + id.application().application().value() + id.application().instance().value() + id.cluster().value());
+        String idSeed = object.field(idSeedField).asString();
         Optional<DomainName> hostname = SlimeUtils.optionalString(object.field(hostnameField)).map(DomainName::of);
         Optional<String> ip4Address = SlimeUtils.optionalString(object.field(lbIpAddressField));
         Optional<String> ip6Address = SlimeUtils.optionalString(object.field(lbIp6AddressField));
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 9ec63933921..60341661fc0 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
@@ -58,7 +58,7 @@ public class LoadBalancerSerializerTest {
                                                 LoadBalancer.State.active,
                                                 now);
 
-            var serialized = LoadBalancerSerializer.fromJson(loadBalancer.id(), LoadBalancerSerializer.toJson(loadBalancer));
+            var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer));
             assertEquals(loadBalancer.id(), serialized.id());
             assertEquals(loadBalancer.idSeed(), serialized.idSeed());
             assertEquals(loadBalancer.instance().get().hostname(), serialized.instance().get().hostname());
@@ -89,7 +89,7 @@ public class LoadBalancerSerializerTest {
                                                 LoadBalancer.State.active,
                                                 now);
 
-            var serialized = LoadBalancerSerializer.fromJson(loadBalancer.id(), LoadBalancerSerializer.toJson(loadBalancer));
+            var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer));
             assertEquals(loadBalancer.id(), serialized.id());
             assertEquals(loadBalancer.idSeed(), serialized.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, "seed", Optional.empty(), LoadBalancer.State.reserved, now);
 
-        var serialized = LoadBalancerSerializer.fromJson(loadBalancerId, LoadBalancerSerializer.toJson(loadBalancer));
+        var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer));
         assertEquals(loadBalancer.id(), serialized.id());
         assertEquals(loadBalancer.idSeed(), serialized.idSeed());
         assertEquals(loadBalancer.instance(), serialized.instance());