Include connection spec hosts correctly in permissible zk clients

2 files changed, 6 insertions, 4 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index b0e178bea92..9edf1eeaf01 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -358,7 +358,7 @@ public class NodeRepository extends AbstractComponent {
             s.append(node.hostname()).append(",");
 
         // Add the zooKeeper servers
-        for (String hostPort : curator.connectionSpec().split("/"))
+        for (String hostPort : curator.connectionSpec().split(","))
             s.append(hostPort.split(":")[0]).append(",");
 
         if (s.length() > 0)
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
index a8c839a6f44..dc4744c9eaf 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
@@ -30,7 +30,9 @@ public class NodeRepositoryTest {
     public void nodeRepositoryTest() {
         NodeFlavors nodeFlavors = new NodeFlavors(createConfig());
         Clock clock = new ManualClock();
-        NodeRepository nodeRepository = new NodeRepository(nodeFlavors, new MockCurator(), clock);
+        MockCurator curator = new MockCurator();
+        curator.setConnectionSpec("server1:1234,server2:5678");
+        NodeRepository nodeRepository = new NodeRepository(nodeFlavors, curator, clock);
 
         assertEquals(0, nodeRepository.getNodes(Node.Type.tenant).size());
 
@@ -41,13 +43,13 @@ public class NodeRepositoryTest {
         nodeRepository.addNodes(nodes);
 
         assertEquals(3, nodeRepository.getNodes(Node.Type.tenant).size());
-        assertEquals(asSet("host1,host2,host3"), asSet(System.getProperty(ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY)));
+        assertEquals(asSet("host1,host2,host3,server1,server2"), asSet(System.getProperty(ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY)));
         
         nodeRepository.move("host2", Node.State.parked);
         assertTrue(nodeRepository.remove("host2"));
 
         assertEquals(2, nodeRepository.getNodes(Node.Type.tenant).size());
-        assertEquals(asSet("host1,host3"), asSet(System.getProperty(ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY)));
+        assertEquals(asSet("host1,host3,server1,server2"), asSet(System.getProperty(ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY)));
     }
     
     private Set<String> asSet(String s) {