Allow LoadBalancerInstance to specify either IP address or domain name

2 files changed, 19 insertions, 6 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 825e46865fe..1b5fceecbf9 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
@@ -28,7 +28,7 @@ public class SharedLoadBalancerServiceTest {
     public void test_create_lb() {
         var lb = loadBalancerService.create(new LoadBalancerSpec(applicationId, clusterId, reals, Optional.empty()), false);
 
-        assertEquals(HostName.of("vip.example.com"), lb.hostname());
+        assertEquals(Optional.of(HostName.of("vip.example.com")), lb.hostname());
         assertEquals(Optional.empty(), lb.dnsZone());
         assertEquals(Set.of(), lb.networks());
         assertEquals(Set.of(4443), lb.ports());
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 ce8fc2e9d03..5bb9b71a223 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
@@ -24,15 +24,16 @@ import static org.junit.Assert.assertEquals;
  */
 public class LoadBalancerSerializerTest {
 
+    private static final LoadBalancerId loadBalancerId = new LoadBalancerId(
+            ApplicationId.from("tenant1", "application1", "default"), ClusterSpec.Id.from("qrs"));;
+
     @Test
     public void test_serialization() {
         var now = Instant.now();
-        var loadBalancer = new LoadBalancer(new LoadBalancerId(ApplicationId.from("tenant1",
-                                                                                  "application1",
-                                                                                  "default"),
-                                                               ClusterSpec.Id.from("qrs")),
+        var loadBalancer = new LoadBalancer(loadBalancerId,
                                             Optional.of(new LoadBalancerInstance(
-                                                    DomainName.of("lb-host"),
+                                                    Optional.of(DomainName.of("lb-host")),
+                                                    Optional.empty(),
                                                     Optional.of(new DnsZone("zone-id-1")),
                                                     ImmutableSet.of(4080, 4443),
                                                     ImmutableSet.of("10.2.3.4/24"),
@@ -58,4 +59,16 @@ public class LoadBalancerSerializerTest {
         assertEquals(loadBalancer.instance().get().cloudAccount(), serialized.instance().get().cloudAccount());
     }
 
+    @Test
+    public void no_instance_serialization() {
+        var now = Instant.now();
+        var loadBalancer = new LoadBalancer(loadBalancerId, Optional.empty(), LoadBalancer.State.reserved, now);
+
+        var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer));
+        assertEquals(loadBalancer.id(), serialized.id());
+        assertEquals(loadBalancer.instance(), serialized.instance());
+        assertEquals(loadBalancer.state(), serialized.state());
+        assertEquals(loadBalancer.changedAt().truncatedTo(MILLIS), serialized.changedAt());
+    }
+
 }