diff options
Diffstat (limited to 'controller-server/src/test')
6 files changed, 42 insertions, 8 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index 61c397d893a..927596ca9ab 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -248,7 +248,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer List<Node> nodes = nodeRepository.list(deployment.zoneId(), deployment.applicationId()); for (Node node : nodes) { nodeRepository.putByHostname(deployment.zoneId(), new Node(node.hostname(), - node.state(), node.type(), + Node.State.active, + node.type(), node.owner(), node.currentVersion(), application.version().get())); 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())); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java index b053bfa1bfe..7a008d1f478 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java @@ -168,7 +168,7 @@ public class OsUpgraderTest { node.hostname(), node.state(), node.type(), node.owner(), node.currentVersion(), node.wantedVersion(), node.wantedOsVersion(), node.wantedOsVersion(), node.serviceState(), node.restartGeneration(), node.wantedRestartGeneration(), node.rebootGeneration(), - node.wantedRebootGeneration())); + node.wantedRebootGeneration(), node.canonicalFlavor(), node.clusterId(), node.clusterType())); } assertCurrent(version, application, zone); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index ec17e26d867..e60bbdc4d84 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -380,6 +380,11 @@ public class ApplicationApiTest extends ControllerContainerTest { .recursive("true"), new File("application1-recursive.json")); + // GET nodes + tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-central-1/instance/default/nodes", GET) + .userIdentity(USER_ID), + new File("application-nodes.json")); + // GET logs tester.assertResponse(request("/application/v4/tenant/tenant2/application/application1/environment/prod/region/us-central-1/instance/default/logs?from=1233&to=3214", GET) .userIdentity(USER_ID), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json new file mode 100644 index 00000000000..eb53ff7161e --- /dev/null +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json @@ -0,0 +1,13 @@ +{ + "nodes": [ + { + "hostname": "host-tenant1:application1:default-prod.us-central-1", + "state": "active", + "orchestration": "unorchestrated", + "version": "6.1", + "flavor": "d-2-8-50", + "clusterId": "cluster", + "clusterType": "container" + } + ] +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java index 1eb3316a33e..bc8dd8d4479 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java @@ -149,7 +149,7 @@ public class OsApiTest extends ControllerContainerTest { node.hostname(), node.state(), node.type(), node.owner(), node.currentVersion(), node.wantedVersion(), node.wantedOsVersion(), node.wantedOsVersion(), node.serviceState(), node.restartGeneration(), node.wantedRestartGeneration(), node.rebootGeneration(), - node.wantedRebootGeneration())); + node.wantedRebootGeneration(), node.canonicalFlavor(), node.clusterId(), node.clusterType())); } } } |