diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2018-11-30 09:19:34 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2018-11-30 09:19:34 +0100 |
| commit | 47093cf1f0c634ea8834697c36048297ab97759d (patch) | |
| tree | 72eb9e9b4328e44c75bbcc9aafd93d2772f57b7c /node-admin | |
| parent | f72b86aac9ed460779080f22b3f84c8a75a317ab (diff) | |
Add withRestartGeneration() to NodeAttributes without Optional
Diffstat (limited to 'node-admin')
3 files changed, 7 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java index 91ff159ac41..44bc606f385 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java @@ -26,6 +26,10 @@ public class NodeAttributes { return this; } + public NodeAttributes withRestartGeneration(long restartGeneration) { + return withRestartGeneration(Optional.of(restartGeneration)); + } + public NodeAttributes withRebootGeneration(long rebootGeneration) { this.rebootGeneration = Optional.of(rebootGeneration); return this; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java index da2dde18d96..ac13775d6fa 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java @@ -136,7 +136,7 @@ public class RealNodeRepositoryTest { nodeRepositoryApi.updateNodeAttributes( hostname, new NodeAttributes() - .withRestartGeneration(Optional.of(1L)) + .withRestartGeneration(1) .withDockerImage(new DockerImage("image-1:6.2.3"))); } @@ -146,7 +146,7 @@ public class RealNodeRepositoryTest { nodeRepositoryApi.updateNodeAttributes( hostname, new NodeAttributes() - .withRestartGeneration(Optional.of(1L)) + .withRestartGeneration(1) .withDockerImage(new DockerImage("image-1"))); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java index 2b8727529f2..4cf349562a3 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java @@ -9,8 +9,6 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; import com.yahoo.vespa.hosted.provision.Node; import org.junit.Test; -import java.util.Optional; - import static com.yahoo.vespa.hosted.node.admin.integrationTests.DockerTester.NODE_PROGRAM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -51,7 +49,7 @@ public class RestartTest { tester.inOrder(tester.docker).executeInContainerAsUser( eq(new ContainerName("host1")), any(), any(), eq(NODE_PROGRAM), eq("restart-vespa")); tester.inOrder(tester.nodeRepository).updateNodeAttributes( - eq(hostname), eq(new NodeAttributes().withRestartGeneration(Optional.of(2L)))); + eq(hostname), eq(new NodeAttributes().withRestartGeneration(2))); } } } |