diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-01-08 15:38:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 15:38:57 +0100 |
| commit | 93057cb2141dee8846c9304eb6a9aae2ba9c4dc0 (patch) | |
| tree | 42a27eb6f64d5380d93200db00efcecaa0deb203 /controller-server/src/test/java/com | |
| parent | bee852eaebcc9ac33d605785d588a8de259b6243 (diff) | |
| parent | 7748dad9b0e15bc868bc0f30eeb12eba150b116c (diff) | |
Merge pull request #11702 from vespa-engine/olaa/allow-any-clustertype
Allow any cluster type
Diffstat (limited to 'controller-server/src/test/java/com')
2 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java index 06a815819f4..ed8918786c5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java @@ -116,7 +116,7 @@ public class DeploymentMetricsMaintainerTest { } private void setMetrics(ApplicationId application, Map<String, Double> metrics) { - var clusterMetrics = new ClusterMetrics("default", ClusterMetrics.ClusterType.container); + var clusterMetrics = new ClusterMetrics("default", "container"); for (var kv : metrics.entrySet()) { clusterMetrics = clusterMetrics.addMetric(kv.getKey(), kv.getValue()); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/metric/ConfigServerMetricsTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/metric/ConfigServerMetricsTest.java index dad7ea4ec31..3d1cb3eba86 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/metric/ConfigServerMetricsTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/metric/ConfigServerMetricsTest.java @@ -44,12 +44,12 @@ public class ConfigServerMetricsTest { // var deploymentId = new DeploymentId(applicationId, zoneId); - var clusterMetrics1 = new ClusterMetrics("niceCluster", ClusterMetrics.ClusterType.container) {{ + var clusterMetrics1 = new ClusterMetrics("niceCluster", "container") {{ addMetric("queriesPerSecond", 23.0); addMetric("queryLatency", 1337.0); }}; - var clusterMetrics2 = new ClusterMetrics("alsoNiceCluster", ClusterMetrics.ClusterType.container) {{ + var clusterMetrics2 = new ClusterMetrics("alsoNiceCluster", "container") {{ addMetric("queriesPerSecond", 11.0); addMetric("queryLatency", 12.0); }}; |