diff options
Diffstat (limited to 'node-maintainer/src/main/java/com/yahoo')
13 files changed, 30 insertions, 40 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/OutputParser.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/parser/OutputParser.java index 0df3ff31dae..bac7a4e0fdc 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/OutputParser.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/parser/OutputParser.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.hosted.node.verification.commons; +package com.yahoo.vespa.hosted.node.verification.commons.parser; import java.util.ArrayList; import java.util.regex.Pattern; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/ParseInstructions.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/parser/ParseInstructions.java index f2bf2d60758..2044ac45e96 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/ParseInstructions.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/parser/ParseInstructions.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.hosted.node.verification.commons; +package com.yahoo.vespa.hosted.node.verification.commons.parser; import java.util.ArrayList; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/ParseResult.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/parser/ParseResult.java index 57b42aa5dc9..130cdba86aa 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/ParseResult.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/parser/ParseResult.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.hosted.node.verification.commons; +package com.yahoo.vespa.hosted.node.verification.commons.parser; import java.util.Objects; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/ReportSender.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java index 8b26a5cce37..73c8d7b9b80 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/ReportSender.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java @@ -1,23 +1,17 @@ -package com.yahoo.vespa.hosted.node.verification.commons; +package com.yahoo.vespa.hosted.node.verification.commons.report; import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.vespa.hosted.node.verification.commons.noderepo.NodeRepoInfoRetriever; import com.yahoo.vespa.hosted.node.verification.commons.noderepo.NodeRepoJsonModel; -import com.yahoo.vespa.hosted.node.verification.commons.report.BenchmarkReport; -import com.yahoo.vespa.hosted.node.verification.commons.report.HardwareDivergenceReport; -import com.yahoo.vespa.hosted.node.verification.commons.report.SpecVerificationReport; import java.io.IOException; import java.net.URL; import java.util.ArrayList; -import java.util.logging.Logger; public class ReportSender { - private static final Logger logger = Logger.getLogger(ReportSender.class.getName()); - - private static void updateNodeRepository(ArrayList<URL> nodeInfoUrls, HardwareDivergenceReport hardwareDivergenceReport) throws IOException { + private static void printHardwareDivergenceReport(HardwareDivergenceReport hardwareDivergenceReport) throws IOException { ObjectMapper om = new ObjectMapper(); String report; if (hardwareDivergenceReport.isHardwareDivergenceReportEmpty()){ @@ -32,13 +26,13 @@ public class ReportSender { public static void reportBenchmarkResults(BenchmarkReport benchmarkReport, ArrayList<URL> nodeInfoUrls) throws IOException { HardwareDivergenceReport hardwareDivergenceReport = generateHardwareDivergenceReport(nodeInfoUrls); hardwareDivergenceReport.setBenchmarkReport(benchmarkReport); - updateNodeRepository(nodeInfoUrls, hardwareDivergenceReport); + printHardwareDivergenceReport(hardwareDivergenceReport); } public static void reportSpecVerificationResults(SpecVerificationReport specVerificationReport, ArrayList<URL> nodeInfoUrls) throws IOException { HardwareDivergenceReport hardwareDivergenceReport = generateHardwareDivergenceReport(nodeInfoUrls); hardwareDivergenceReport.setSpecVerificationReport(specVerificationReport); - updateNodeRepository(nodeInfoUrls, hardwareDivergenceReport); + printHardwareDivergenceReport(hardwareDivergenceReport); } private static HardwareDivergenceReport generateHardwareDivergenceReport(ArrayList<URL> nodeInfoUrls) throws IOException { diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java index a513867ccdd..d33b4100084 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java @@ -1,10 +1,8 @@ package com.yahoo.vespa.hosted.node.verification.hardware; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; import com.yahoo.vespa.hosted.node.verification.commons.HostURLGenerator; -import com.yahoo.vespa.hosted.node.verification.commons.ReportSender; +import com.yahoo.vespa.hosted.node.verification.commons.report.ReportSender; import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.Benchmark; import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.BenchmarkResults; import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.CPUBenchmark; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/CPUBenchmark.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/CPUBenchmark.java index 76c5bfef4ac..151dec6db8c 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/CPUBenchmark.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/CPUBenchmark.java @@ -1,9 +1,9 @@ package com.yahoo.vespa.hosted.node.verification.hardware.benchmarks; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; -import com.yahoo.vespa.hosted.node.verification.commons.OutputParser; -import com.yahoo.vespa.hosted.node.verification.commons.ParseInstructions; -import com.yahoo.vespa.hosted.node.verification.commons.ParseResult; +import com.yahoo.vespa.hosted.node.verification.commons.parser.OutputParser; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseInstructions; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseResult; import java.io.IOException; import java.util.ArrayList; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/DiskBenchmark.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/DiskBenchmark.java index 0512d79a023..f6c7035eea1 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/DiskBenchmark.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/DiskBenchmark.java @@ -1,9 +1,9 @@ package com.yahoo.vespa.hosted.node.verification.hardware.benchmarks; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; -import com.yahoo.vespa.hosted.node.verification.commons.OutputParser; -import com.yahoo.vespa.hosted.node.verification.commons.ParseInstructions; -import com.yahoo.vespa.hosted.node.verification.commons.ParseResult; +import com.yahoo.vespa.hosted.node.verification.commons.parser.OutputParser; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseInstructions; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseResult; import java.io.IOException; import java.util.ArrayList; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/MemoryBenchmark.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/MemoryBenchmark.java index 3ef5796e032..07fb633f75f 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/MemoryBenchmark.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/MemoryBenchmark.java @@ -1,9 +1,9 @@ package com.yahoo.vespa.hosted.node.verification.hardware.benchmarks; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; -import com.yahoo.vespa.hosted.node.verification.commons.OutputParser; -import com.yahoo.vespa.hosted.node.verification.commons.ParseInstructions; -import com.yahoo.vespa.hosted.node.verification.commons.ParseResult; +import com.yahoo.vespa.hosted.node.verification.commons.parser.OutputParser; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseInstructions; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseResult; import java.io.IOException; import java.util.ArrayList; 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 013cae5ab52..cbabe2224ca 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 @@ -1,10 +1,8 @@ package com.yahoo.vespa.hosted.node.verification.spec; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; import com.yahoo.vespa.hosted.node.verification.commons.HostURLGenerator; -import com.yahoo.vespa.hosted.node.verification.commons.ReportSender; +import com.yahoo.vespa.hosted.node.verification.commons.report.ReportSender; import com.yahoo.vespa.hosted.node.verification.commons.noderepo.IPAddressVerifier; import com.yahoo.vespa.hosted.node.verification.commons.noderepo.NodeJsonConverter; import com.yahoo.vespa.hosted.node.verification.commons.noderepo.NodeRepoInfoRetriever; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/CPURetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/CPURetriever.java index e903bc4183f..f0d3e258f17 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/CPURetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/CPURetriever.java @@ -1,9 +1,9 @@ package com.yahoo.vespa.hosted.node.verification.spec.retrievers; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; -import com.yahoo.vespa.hosted.node.verification.commons.OutputParser; -import com.yahoo.vespa.hosted.node.verification.commons.ParseInstructions; -import com.yahoo.vespa.hosted.node.verification.commons.ParseResult; +import com.yahoo.vespa.hosted.node.verification.commons.parser.OutputParser; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseInstructions; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseResult; import java.io.IOException; import java.util.ArrayList; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java index 2a0dafd8cd4..531b3af1796 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java @@ -1,9 +1,9 @@ package com.yahoo.vespa.hosted.node.verification.spec.retrievers; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; -import com.yahoo.vespa.hosted.node.verification.commons.OutputParser; -import com.yahoo.vespa.hosted.node.verification.commons.ParseInstructions; -import com.yahoo.vespa.hosted.node.verification.commons.ParseResult; +import com.yahoo.vespa.hosted.node.verification.commons.parser.OutputParser; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseInstructions; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseResult; import com.yahoo.vespa.hosted.node.verification.spec.retrievers.HardwareInfo.DiskType; import java.io.IOException; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/MemoryRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/MemoryRetriever.java index f82bafb5a97..24a4327fe52 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/MemoryRetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/MemoryRetriever.java @@ -1,9 +1,9 @@ package com.yahoo.vespa.hosted.node.verification.spec.retrievers; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; -import com.yahoo.vespa.hosted.node.verification.commons.OutputParser; -import com.yahoo.vespa.hosted.node.verification.commons.ParseInstructions; -import com.yahoo.vespa.hosted.node.verification.commons.ParseResult; +import com.yahoo.vespa.hosted.node.verification.commons.parser.OutputParser; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseInstructions; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseResult; import java.io.IOException; import java.util.ArrayList; 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..03d93494cbb 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 @@ -1,9 +1,9 @@ package com.yahoo.vespa.hosted.node.verification.spec.retrievers; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; -import com.yahoo.vespa.hosted.node.verification.commons.OutputParser; -import com.yahoo.vespa.hosted.node.verification.commons.ParseInstructions; -import com.yahoo.vespa.hosted.node.verification.commons.ParseResult; +import com.yahoo.vespa.hosted.node.verification.commons.parser.OutputParser; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseInstructions; +import com.yahoo.vespa.hosted.node.verification.commons.parser.ParseResult; import com.yahoo.vespa.hosted.node.verification.spec.VerifierSettings; import org.apache.commons.exec.ExecuteException; |