Allow additional IP address for private service LB

1 files changed, 63 insertions, 30 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 16e82e116e1..2111dea262d 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 org.junit.Test;
 import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import static java.time.temporal.ChronoUnit.MILLIS;
 import static org.junit.Assert.assertEquals;
@@ -35,37 +36,69 @@ public class LoadBalancerSerializerTest {
     @Test
     public void test_serialization() {
         var now = Instant.now();
-        var loadBalancer = new LoadBalancer(loadBalancerId,
-                                            Optional.of(new LoadBalancerInstance(
-                                                    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"),
-                                                    ImmutableSet.of(new Real(DomainName.of("real-1"),
-                                                                             "127.0.0.1",
-                                                                             4080),
-                                                                    new Real(DomainName.of("real-2"),
-                                                                             "127.0.0.2",
-                                                                             4080)),
-                                                    new ZoneEndpoint(false, true, List.of(new AllowedUrn(AccessType.awsPrivateLink, "123"))),
-                                                    Optional.of(PrivateServiceId.of("foo")),
-                                                    CloudAccount.from("012345678912"))),
-                                            LoadBalancer.State.active,
-                                            now);
+        {
+            var loadBalancer = new LoadBalancer(loadBalancerId,
+                                                Optional.of(new LoadBalancerInstance(
+                                                        Optional.of(DomainName.of("lb-host")),
+                                                        Optional.empty(),
+                                                        Optional.empty(),
+                                                        Optional.of(new DnsZone("zone-id-1")),
+                                                        Set.of(4080, 4443),
+                                                        Set.of("10.2.3.4/24"),
+                                                        Set.of(new Real(DomainName.of("real-1"),
+                                                                                 "127.0.0.1",
+                                                                                 4080),
+                                                                        new Real(DomainName.of("real-2"),
+                                                                                 "127.0.0.2",
+                                                                                 4080)),
+                                                        new ZoneEndpoint(false, true, List.of(new AllowedUrn(AccessType.awsPrivateLink, "123"))),
+                                                        Optional.of(PrivateServiceId.of("foo")),
+                                                        CloudAccount.from("012345678912"))),
+                                                LoadBalancer.State.active,
+                                                now);
 
-        var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer));
-        assertEquals(loadBalancer.id(), serialized.id());
-        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());
-        assertEquals(loadBalancer.instance().get().networks(), serialized.instance().get().networks());
-        assertEquals(loadBalancer.state(), serialized.state());
-        assertEquals(loadBalancer.changedAt().truncatedTo(MILLIS), serialized.changedAt());
-        assertEquals(loadBalancer.instance().get().reals(), serialized.instance().get().reals());
-        assertEquals(loadBalancer.instance().get().settings(), serialized.instance().get().settings());
-        assertEquals(loadBalancer.instance().get().serviceId(), serialized.instance().get().serviceId());
-        assertEquals(loadBalancer.instance().get().cloudAccount(), serialized.instance().get().cloudAccount());
+            var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer));
+            assertEquals(loadBalancer.id(), serialized.id());
+            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());
+            assertEquals(loadBalancer.instance().get().networks(), serialized.instance().get().networks());
+            assertEquals(loadBalancer.state(), serialized.state());
+            assertEquals(loadBalancer.changedAt().truncatedTo(MILLIS), serialized.changedAt());
+            assertEquals(loadBalancer.instance().get().reals(), serialized.instance().get().reals());
+            assertEquals(loadBalancer.instance().get().settings(), serialized.instance().get().settings());
+            assertEquals(loadBalancer.instance().get().serviceId(), serialized.instance().get().serviceId());
+            assertEquals(loadBalancer.instance().get().cloudAccount(), serialized.instance().get().cloudAccount());
+        }
+        {
+            var loadBalancer = new LoadBalancer(loadBalancerId,
+                                                Optional.of(new LoadBalancerInstance(
+                                                        Optional.empty(),
+                                                        Optional.of("1.2.3.4"),
+                                                        Optional.of("4.3.2.1"),
+                                                        Optional.of(new DnsZone("zone-id-1")),
+                                                        Set.of(4443),
+                                                        Set.of("10.2.3.4/24", "12.3.2.1/30"),
+                                                        Set.of(),
+                                                        new ZoneEndpoint(true, false, List.of()),
+                                                        Optional.empty(),
+                                                        CloudAccount.from("012345678912"))),
+                                                LoadBalancer.State.active,
+                                                now);
+
+            var serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer));
+            assertEquals(loadBalancer.id(), serialized.id());
+            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());
+            assertEquals(loadBalancer.instance().get().networks(), serialized.instance().get().networks());
+            assertEquals(loadBalancer.state(), serialized.state());
+            assertEquals(loadBalancer.changedAt().truncatedTo(MILLIS), serialized.changedAt());
+            assertEquals(loadBalancer.instance().get().reals(), serialized.instance().get().reals());
+            assertEquals(loadBalancer.instance().get().settings(), serialized.instance().get().settings());
+            assertEquals(loadBalancer.instance().get().serviceId(), serialized.instance().get().serviceId());
+            assertEquals(loadBalancer.instance().get().cloudAccount(), serialized.instance().get().cloudAccount());
+        }
     }
 
     @Test