diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-01-09 15:53:04 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2023-01-09 15:53:04 +0100 |
commit | 9479937fb672ebb3b73c0baedfec550814e442b9 (patch) | |
tree | 0e0b66e2e4379d7c6027ebe38f3940ac93571c9d | |
parent | c1f5c1fc437594682b00182693a31c9482be0968 (diff) |
Verify load data
2 files changed, 9 insertions, 3 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/LoadData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/LoadData.java index 4aeb56f51d6..c0c53a49228 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/LoadData.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/LoadData.java @@ -14,11 +14,13 @@ import com.yahoo.vespa.hosted.controller.api.integration.configserver.Load; public class LoadData { @JsonProperty("cpu") - private Double cpu; + public Double cpu; + @JsonProperty("memory") - private Double memory; + public Double memory; + @JsonProperty("disk") - private Double disk; + public Double disk; public Load toLoad() { return new Load(cpu, memory, disk); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java index 3084ce9215a..6374bf52687 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java @@ -78,6 +78,10 @@ public class AutoscalingMaintainerTest { tester.maintainer().maintain(); assertTrue(tester.deployer().lastDeployTime(app1).isEmpty()); // since autoscaling is off assertTrue(tester.deployer().lastDeployTime(app2).isPresent()); + assertNotEquals(Load.zero(), + tester.nodeRepository().applications().require(app1).cluster(cluster1.id()).get().target().peak()); + assertNotEquals(Load.zero(), + tester.nodeRepository().applications().require(app1).cluster(cluster1.id()).get().target().ideal()); } @Test |