diff options
author | Harald Musum <musum@yahoo-inc.com> | 2018-01-22 20:58:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-22 20:58:28 +0100 |
commit | 077a484b444b5a175d1f5d03d50a521eb8f64d46 (patch) | |
tree | 1048f21a985d758d4ad5f25b46df60f109f7efa6 /config-model/src/test/java | |
parent | 975cfe7e99271d447051fd320d7ea5ba822217f7 (diff) | |
parent | 93d76492642dbab93fca5b74db5e124f7e082653 (diff) |
Merge pull request #4738 from vespa-engine/arnej/redo-logforwarding-setup
postpone adding logforwarder until all hosts are determined
Diffstat (limited to 'config-model/src/test/java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java | 2 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java | 6 |
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()); |