diff options
author | sindre <sindre.grostad@icloud.com> | 2017-08-15 10:29:40 +0200 |
---|---|---|
committer | Ola Aunrønning <olaa@yahoo-inc.com> | 2017-08-15 12:43:12 +0200 |
commit | 520e93d805541538a9ba5449f10379348d23ddab (patch) | |
tree | 4e4bf567eeda1eff65441039cf627be6dafad788 /node-maintainer | |
parent | e1096ce179dcc5c6c16cd80e17159e6e27f5bbfb (diff) |
Removed check for VM, will be done in chef
Diffstat (limited to 'node-maintainer')
4 files changed, 2 insertions, 16 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoJsonModel.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoJsonModel.java index 9a314b061c4..f3792af0553 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoJsonModel.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoJsonModel.java @@ -31,8 +31,6 @@ public class NodeRepoJsonModel { @JsonProperty private String hostname; @JsonProperty - private String environment; - @JsonProperty private String hardwareDivergence; private String nodeRepoUrl; @@ -80,11 +78,8 @@ public class NodeRepoJsonModel { return hostname; } - public String getEnvironment() { - return environment; - } - public String getHardwareDivergence() { return hardwareDivergence; } + } diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/HardwareNodeComparator.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/HardwareNodeComparator.java index 6d4bcf575ab..4b96d6c9b92 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/HardwareNodeComparator.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/HardwareNodeComparator.java @@ -71,6 +71,7 @@ public class HardwareNodeComparator { if (nodeRepoHardwareInfo.isIpv6Connection() && !actualHardware.isIpv6Connection()) { specVerificationReport.setActualIpv6Connection(actualHardware.isIpv6Connection()); } + } private static boolean outsideThreshold(double value1, double value2 , double thresholdPercentage) { double lowerThresholdPercentage = 1 - thresholdPercentage; 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 2893351a01f..19e1e6c0f40 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 @@ -30,10 +30,6 @@ public class SpecVerifier { public static boolean verifySpec(CommandExecutor commandExecutor, ArrayList<URL> nodeInfoUrls) throws IOException { NodeRepoJsonModel nodeRepoJsonModel = getNodeRepositoryJSON(nodeInfoUrls); - if (nodeRepoJsonModel.getEnvironment().equals(VIRTUAL_ENVIRONMENT)) { - logger.log(Level.INFO, "Node is virtual machine - No need for verification"); - return true; - } VerifierSettings verifierSettings = new VerifierSettings(nodeRepoJsonModel); HardwareInfo actualHardware = HardwareInfoRetriever.retrieve(commandExecutor, verifierSettings); SpecVerificationReport specVerificationReport = makeVerificationReport(actualHardware, nodeRepoJsonModel); diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java index e215ad7355c..9cf3cf7138e 100644 --- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java +++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java @@ -59,12 +59,6 @@ public class SpecVerifierTest { } @Test - public void verifySpec_environment_is_virtual_machine_should_return_true() throws Exception { - nodeInfoUrls.add(new URL(URL_RESOURCE_PATH + "/nodeRepoVirtualMachine.json")); - assertTrue(SpecVerifier.verifySpec(mockCommandExecutor, nodeInfoUrls)); - } - - @Test public void verifySpec_unequal_nodeRepoInfo_and_hardware_should_return_false() throws Exception { nodeInfoUrls.add(new URL(URL_RESOURCE_PATH + "/nodeRepo.json")); mockCommandExecutor.addCommand("cat " + CPU_INFO_PATH); |