aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2019-04-11 09:41:00 +0200
committerGitHub <noreply@github.com>2019-04-11 09:41:00 +0200
commitaccba940ad0884d4f52880f75a7509f60908ab84 (patch)
tree89715986fa90b69d014911fc8128107f34dfa1b5 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
parent9f9476e91cc7c92424cdb6f92eb6743f36413fa4 (diff)
parent5769a20f4b4c98bfab9ba8e5caaddd1fd41f37d1 (diff)
Merge pull request #9081 from vespa-engine/jvenstad/nodes-in-application-v4
Jvenstad/nodes in application v4
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java25
1 files changed, 20 insertions, 5 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
index ac15ab046c3..49bc910ac33 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
@@ -89,7 +89,10 @@ public class NodeRepositoryMock implements NodeRepository {
node.restartGeneration(),
node.wantedRestartGeneration(),
node.rebootGeneration(),
- node.wantedRebootGeneration()))
+ node.wantedRebootGeneration(),
+ node.canonicalFlavor(),
+ node.clusterId(),
+ node.clusterType()))
.forEach(node -> putByHostname(zone, node));
}
@@ -131,7 +134,10 @@ public class NodeRepositoryMock implements NodeRepository {
node.restartGeneration(),
node.wantedRestartGeneration() + 1,
node.rebootGeneration(),
- node.wantedRebootGeneration()));
+ node.wantedRebootGeneration(),
+ node.canonicalFlavor(),
+ node.clusterId(),
+ node.clusterType()));
}
public void doRestart(DeploymentId deployment, Optional<HostName> hostname) {
@@ -147,7 +153,10 @@ public class NodeRepositoryMock implements NodeRepository {
node.restartGeneration() + 1,
node.wantedRestartGeneration(),
node.rebootGeneration(),
- node.wantedRebootGeneration()));
+ node.wantedRebootGeneration(),
+ node.canonicalFlavor(),
+ node.clusterId(),
+ node.clusterType()));
}
public void requestReboot(DeploymentId deployment, Optional<HostName> hostname) {
@@ -163,7 +172,10 @@ public class NodeRepositoryMock implements NodeRepository {
node.restartGeneration(),
node.wantedRestartGeneration(),
node.rebootGeneration(),
- node.wantedRebootGeneration() + 1));
+ node.wantedRebootGeneration() + 1,
+ node.canonicalFlavor(),
+ node.clusterId(),
+ node.clusterType()));
}
public void doReboot(DeploymentId deployment, Optional<HostName> hostname) {
@@ -179,7 +191,10 @@ public class NodeRepositoryMock implements NodeRepository {
node.restartGeneration(),
node.wantedRestartGeneration(),
node.rebootGeneration() + 1,
- node.wantedRebootGeneration()));
+ node.wantedRebootGeneration(),
+ node.canonicalFlavor(),
+ node.clusterId(),
+ node.clusterType()));
}
}