Merge pull request #4738 from vespa-engine/arnej/redo-logforwarding-setup

postpone adding logforwarder until all hosts are determined

2 files changed, 4 insertions, 4 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
index fed9000f72b..223b50dd180 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
@@ -270,7 +270,7 @@ public class AdminTestCase {
 
         Set<String> configIds = vespaModel.getConfigIds();
         // 1 logforwarder on each host
-        assertTrue(configIds.toString(), configIds.contains("admin/logforwarder.0"));
+        assertTrue(configIds.toString(), configIds.contains("hosts/myhost0/logforwarder"));
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
index 4c09fd8d713..999ebd8ad4e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
@@ -170,12 +170,12 @@ public class DedicatedAdminV4Test {
 
         Set<String> configIds = model.getConfigIds();
         // 1 logforwarder on each host
-        IntStream.of(0, 1, 2).forEach(i -> assertTrue(configIds.toString(), configIds.contains("admin/logforwarder." + i)));
+        IntStream.of(0, 1, 2).forEach(i -> assertTrue(configIds.toString(), configIds.contains("hosts/myhost"+i+"/logforwarder")));
 
         // First forwarder
         {
             LogforwarderConfig.Builder builder = new LogforwarderConfig.Builder();
-            model.getConfig(builder, "admin/logforwarder.0");
+            model.getConfig(builder, "hosts/myhost0/logforwarder");
             LogforwarderConfig config = new LogforwarderConfig(builder);
 
             assertEquals("foo:123", config.deploymentServer());
@@ -186,7 +186,7 @@ public class DedicatedAdminV4Test {
         // Other host's forwarder
         {
             LogforwarderConfig.Builder builder = new LogforwarderConfig.Builder();
-            model.getConfig(builder, "admin/logforwarder.2");
+            model.getConfig(builder, "hosts/myhost2/logforwarder");
             LogforwarderConfig config = new LogforwarderConfig(builder);
 
             assertEquals("foo:123", config.deploymentServer());