From 6b512283fd1e7a315ad652fab2964a2300a0f53b Mon Sep 17 00:00:00 2001 From: sindre Date: Mon, 7 Aug 2017 14:40:33 +0200 Subject: Added VerifierSettings to be able to choose what tests to be executed based on node repo --- .../vespa/hosted/node/verification/spec/SpecVerifier.java | 6 +++--- .../hosted/node/verification/spec/VerifierSettings.java | 15 ++++++++++----- .../node/verification/spec/retrievers/NetRetriever.java | 2 +- .../spec/retrievers/HardwareInfoRetrieverTest.java | 2 +- .../verification/spec/retrievers/NetRetrieverTest.java | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) (limited to 'node-maintainer') diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java index 0fcb6206237..8789fa53d4f 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java @@ -36,9 +36,9 @@ public class SpecVerifier { } VerifierSettings verifierSettings = new VerifierSettings(nodeRepoJsonModel); HardwareInfo actualHardware = HardwareInfoRetriever.retrieve(commandExecutor, verifierSettings); - VerificationReport verificationReport = makeVerificationReport(actualHardware, nodeRepoJsonModel); - printResults(verificationReport); - return isValidSpec(verificationReport); + YamasSpecReport yamasSpecReport = makeYamasSpecReport(actualHardware, nodeRepoJsonModel); + printResults(yamasSpecReport); + return yamasSpecReport.getMetrics().isMatch(); } private static boolean isValidSpec(VerificationReport verificationReport) throws JsonProcessingException { diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/VerifierSettings.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/VerifierSettings.java index 936c19f6c7f..f219546cd31 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/VerifierSettings.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/VerifierSettings.java @@ -9,18 +9,23 @@ import com.yahoo.vespa.hosted.node.verification.spec.noderepo.NodeRepoJsonModel; public class VerifierSettings { - private final boolean checkIPv6; + private final boolean ipv6; public VerifierSettings(){ - this.checkIPv6 = true; + this.ipv6 = true; } public VerifierSettings(NodeRepoJsonModel nodeRepoJsonModel){ - checkIPv6 = nodeRepoJsonModel.getIpv6Address() != null; + if (nodeRepoJsonModel.getIpv6Address() != null){ + ipv6 = true; + } + else { + ipv6 = false; + } } - public boolean isCheckIPv6() { - return checkIPv6; + public boolean isIpv6() { + return ipv6; } } diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java index 85bd585d595..33b9ba722e7 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java @@ -50,7 +50,7 @@ public class NetRetriever implements HardwareRetriever { public void updateInfo() { ArrayList parseResults = findInterface(); findInterfaceSpeed(parseResults); - if (verifierSettings.isCheckIPv6()) { + if (verifierSettings.isIpv6()) { testPingResponse(parseResults); } updateHardwareInfoWithNet(parseResults); diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/HardwareInfoRetrieverTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/HardwareInfoRetrieverTest.java index c068ca83de9..65bf93a9ac6 100644 --- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/HardwareInfoRetrieverTest.java +++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/HardwareInfoRetrieverTest.java @@ -49,7 +49,7 @@ public class HardwareInfoRetrieverTest { @Test public void retriever_should_return_valid_HardwareInfo() { - doReturn(true).when(verifierSettings).isCheckIPv6(); + doReturn(true).when(verifierSettings).isIpv6(); HardwareInfo actualHardwareInfo = HardwareInfoRetriever.retrieve(mockCommandExecutor, verifierSettings); assertEquals(expectedHardwareInfo.getMinDiskAvailableGb(), actualHardwareInfo.getMinDiskAvailableGb(), DELTA); assertEquals(expectedHardwareInfo.getMinMainMemoryAvailableGb(), actualHardwareInfo.getMinMainMemoryAvailableGb(), DELTA); diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetrieverTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetrieverTest.java index 365e2f2f9d4..9e670519294 100644 --- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetrieverTest.java +++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetrieverTest.java @@ -39,7 +39,7 @@ public class NetRetrieverTest { public void setup() { hardwareInfo = new HardwareInfo(); commandExecutor = new MockCommandExecutor(); - doReturn(true).when(verifierSettings).isCheckIPv6(); + doReturn(true).when(verifierSettings).isIpv6(); net = new NetRetriever(hardwareInfo, commandExecutor, verifierSettings); parseResults = new ArrayList<>(); } -- cgit v1.2.3