Extract ConnectionSpec

2 files changed, 74 insertions, 16 deletions

diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/ConnectionSpecTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/ConnectionSpecTest.java
new file mode 100644
index 00000000000..a518d8df843
--- /dev/null
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/ConnectionSpecTest.java
@@ -0,0 +1,74 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.curator;
+
+import com.yahoo.net.HostName;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author mpolden
+ */
+public class ConnectionSpecTest {
+
+    @Test
+    public void create() {
+        HostName.setHostNameForTestingOnly("host2");
+        Config config = new Config(List.of(new Config.Server("host1", 10001),
+                                           new Config.Server("host2", 10002),
+                                           new Config.Server("host3", 10003)));
+
+        {
+            ConnectionSpec spec = ConnectionSpec.create(config.servers, Config.Server::hostname, Config.Server::port, false);
+            assertEquals("host1:10001,host2:10002,host3:10003", spec.local());
+            assertEquals("host1:10001,host2:10002,host3:10003", spec.ensemble());
+            assertEquals(3, spec.ensembleSize());
+        }
+
+        {
+            ConnectionSpec specLocalAffinity = ConnectionSpec.create(config.servers, Config.Server::hostname, Config.Server::port, true);
+            assertEquals("host2:10002", specLocalAffinity.local());
+            assertEquals("host1:10001,host2:10002,host3:10003", specLocalAffinity.ensemble());
+            assertEquals(3, specLocalAffinity.ensembleSize());
+        }
+
+        {
+            ConnectionSpec specFromString = ConnectionSpec.create("host1:10001", "host1:10001,host2:10002");
+            assertEquals("host1:10001", specFromString.local());
+            assertEquals("host1:10001,host2:10002", specFromString.ensemble());
+            assertEquals(2, specFromString.ensembleSize());
+        }
+    }
+
+    private static class Config {
+
+        private final List<Server> servers;
+
+        public Config(List<Server> servers) {
+            this.servers = servers;
+        }
+
+        private static class Server {
+
+            private final String hostname;
+            private final int port;
+
+            public Server(String hostname, int port) {
+                this.hostname = hostname;
+                this.port = port;
+            }
+
+            public String hostname() {
+                return hostname;
+            }
+
+            public int port() {
+                return port;
+            }
+        }
+
+    }
+
+}
diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
index 2bf40c4e2bb..1c7cb3695a8 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
@@ -68,22 +68,6 @@ public class CuratorTest {
         }
     }
 
-    @Test
-     public void localhost_affinity() {
-         String localhostHostName = "myhost";
-         int localhostPort = 123;
-
-         ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder();
-         builder.zookeeperserver(createZKBuilder(localhostHostName, localhostPort));
-         builder.zookeeperserver(createZKBuilder("otherhost", 345));
-         ConfigserverConfig config = new ConfigserverConfig(builder);
-
-         HostName.setHostNameForTestingOnly(localhostHostName);
-
-        String localhostSpec = localhostHostName + ":" + localhostPort;
-         assertEquals(localhostSpec, Curator.createConnectionSpecForLocalhost(config));
-     }
-
     private ConfigserverConfig createTestConfig() {
         ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder();
         builder.zookeeperserver(createZKBuilder(localhost, port1));