diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2017-09-05 13:31:40 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2017-09-05 13:31:40 +0000 |
commit | 834482a1b0e414295cce8cb9e223033d8c194f44 (patch) | |
tree | ab27ee09ec59665a475d209972e9cf3b90a851a7 /config-model | |
parent | a09d33b26978d97c8256f55b89d325ba22ccc50b (diff) |
unit test "display-name"
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java | 15 |
1 files changed, 13 insertions, 2 deletions
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 f6e7d50f643..5b5094a9c43 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 @@ -49,6 +49,11 @@ public class DedicatedAdminV4Test { " <slobroks><nodes count='2' dedicated='true'/></slobroks>" + " <logservers><nodes count='1' dedicated='true'/></logservers>" + " <yamas systemname='vespa.routing' interval='60' />" + + " <metrics>" + + " <consumer id='slingstone'>" + + " <metric id='foobar.count' display-name='foobar'/>" + + " </consumer>" + + " </metrics>" + " <metric-consumers>" + " <consumer name='yamas'>" + " <metric name='upstreams_generated' />" + @@ -73,10 +78,16 @@ public class DedicatedAdminV4Test { assertEquals("vespa.routing", monitoring.getClustername()); assertEquals(60L, (long) monitoring.getIntervalSeconds()); - MetricsConsumer consumer = model.getAdmin().getLegacyUserMetricsConsumers().get(VESPA_CONSUMER_ID); + MetricsConsumer consumer = model.getAdmin().getUserMetrics().getConsumers().get("slingstone"); + assertNotNull(consumer); + Metric metric = consumer.getMetrics().get("foobar.count"); + assertNotNull(metric); + assertEquals("foobar", metric.outputName); + + consumer = model.getAdmin().getLegacyUserMetricsConsumers().get(VESPA_CONSUMER_ID); assertNotNull(consumer); assertEquals(3, consumer.getMetrics().size()); - Metric metric = consumer.getMetrics().get("nginx.upstreams.down.last"); + metric = consumer.getMetrics().get("nginx.upstreams.down.last"); assertNotNull(metric); assertEquals("nginx.upstreams.down", metric.outputName); } |