Rename NodeRepoJsonModel to NodeSpec

11 files changed, 60 insertions, 62 deletions

diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifier.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifier.java
index db4eb6e73cd..4d62fe88c1c 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifier.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifier.java
@@ -27,23 +27,23 @@ public class IPAddressVerifier {
 
     private static final Logger logger = Logger.getLogger(IPAddressVerifier.class.getName());
 
-    public void reportFaultyIpAddresses(NodeRepoJsonModel nodeRepoJsonModel, SpecVerificationReport specVerificationReport) {
-        String[] faultyIpAddresses = getFaultyIpAddresses(nodeRepoJsonModel);
+    public void reportFaultyIpAddresses(NodeSpec nodeSpec, SpecVerificationReport specVerificationReport) {
+        String[] faultyIpAddresses = getFaultyIpAddresses(nodeSpec);
         if (faultyIpAddresses.length > 0) {
             specVerificationReport.setFaultyIpAddresses(faultyIpAddresses);
         }
     }
 
-    public String[] getFaultyIpAddresses(NodeRepoJsonModel jsonModel) {
-        String expectedHostname = jsonModel.getHostname();
+    public String[] getFaultyIpAddresses(NodeSpec nodeSpec) {
+        String expectedHostname = nodeSpec.getHostname();
         List<String> faultyIpAddresses = new ArrayList<>();
         if (expectedHostname == null || expectedHostname.equals(""))
             return new String[0];
-        if (!isValidIpv4(jsonModel.getIpv4Address(), expectedHostname)) {
-            faultyIpAddresses.add(jsonModel.getIpv4Address());
+        if (!isValidIpv4(nodeSpec.getIpv4Address(), expectedHostname)) {
+            faultyIpAddresses.add(nodeSpec.getIpv4Address());
         }
-        if (!isValidIpv6(jsonModel.getIpv6Address(), expectedHostname)) {
-            faultyIpAddresses.add(jsonModel.getIpv6Address());
+        if (!isValidIpv6(nodeSpec.getIpv6Address(), expectedHostname)) {
+            faultyIpAddresses.add(nodeSpec.getIpv6Address());
         }
         return faultyIpAddresses.stream().toArray(String[]::new);
     }
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeJsonConverter.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeJsonConverter.java
index 5cf4bede3f1..449f6431969 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeJsonConverter.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeJsonConverter.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.node.verification.commons.noderepo;
 import com.yahoo.vespa.hosted.node.verification.spec.retrievers.HardwareInfo;
 
 /**
- * Converts a NodeRepoJsonModel object to a HardwareInfo object.
+ * Converts a NodeSpec object to a HardwareInfo object.
  * 
  * @author olaaun
  * @author sgrostad
@@ -15,23 +15,23 @@ public class NodeJsonConverter {
         nodeRepoHardwareInfo.setInterfaceSpeedMbs(1000);
     }
 
-    protected static void setIpv6Interface(NodeRepoJsonModel nodeRepoJsonModel, HardwareInfo nodeRepoHardwareInfo) {
-        if (nodeRepoJsonModel.getIpv6Address() != null) {
+    protected static void setIpv6Interface(NodeSpec nodeSpec, HardwareInfo nodeRepoHardwareInfo) {
+        if (nodeSpec.getIpv6Address() != null) {
             nodeRepoHardwareInfo.setIpv6Interface(true);
         }
     }
 
-    protected static void setIpv4Interface(NodeRepoJsonModel nodeRepoJsonModel, HardwareInfo nodeRepoHardwareInfo) {
-        if (nodeRepoJsonModel.getIpv4Address() != null) {
+    protected static void setIpv4Interface(NodeSpec nodeSpec, HardwareInfo nodeRepoHardwareInfo) {
+        if (nodeSpec.getIpv4Address() != null) {
             nodeRepoHardwareInfo.setIpv4Interface(true);
         }
     }
 
-    public static HardwareInfo convertJsonModelToHardwareInfo(NodeRepoJsonModel nodeRepoJsonModel) {
-        HardwareInfo nodeRepoHardwareInfo = nodeRepoJsonModel.copyToHardwareInfo();
+    public static HardwareInfo convertJsonModelToHardwareInfo(NodeSpec nodeSpec) {
+        HardwareInfo nodeRepoHardwareInfo = nodeSpec.copyToHardwareInfo();
         addStandardSpecifications(nodeRepoHardwareInfo);
-        setIpv4Interface(nodeRepoJsonModel, nodeRepoHardwareInfo);
-        setIpv6Interface(nodeRepoJsonModel, nodeRepoHardwareInfo);
+        setIpv4Interface(nodeSpec, nodeRepoHardwareInfo);
+        setIpv6Interface(nodeSpec, nodeRepoHardwareInfo);
         return nodeRepoHardwareInfo;
     }
 
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoInfoRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoInfoRetriever.java
index 465d42a1f1d..e2daf9014d4 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoInfoRetriever.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoInfoRetriever.java
@@ -10,7 +10,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * Parse JSON from node repository and stores information as a NodeRepoJsonModel object.
+ * Parse JSON from node repository and stores information as a NodeSpec object.
  *
  * @author olaaun
  * @author sgrostad
@@ -19,13 +19,13 @@ public class NodeRepoInfoRetriever {
 
     private static final Logger logger = Logger.getLogger(NodeRepoInfoRetriever.class.getName());
 
-    public static NodeRepoJsonModel retrieve(List<URL> nodeInfoUrls) throws IOException {
-        NodeRepoJsonModel nodeRepoJsonModel;
+    public static NodeSpec retrieve(List<URL> nodeInfoUrls) throws IOException {
+        NodeSpec nodeSpec;
         ObjectMapper objectMapper = new ObjectMapper();
         for (URL nodeInfoURL : nodeInfoUrls) {
             try {
-                nodeRepoJsonModel = objectMapper.readValue(nodeInfoURL, NodeRepoJsonModel.class);
-                return nodeRepoJsonModel;
+                nodeSpec = objectMapper.readValue(nodeInfoURL, NodeSpec.class);
+                return nodeSpec;
             } catch (IOException e) {
                 logger.log(Level.WARNING, "Failed to parse JSON from config server: " + nodeInfoURL.toString(), e);
             }
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/NodeSpec.java
index 5d7ff0df8d1..a2483435e18 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/NodeSpec.java
@@ -19,7 +19,7 @@ import java.util.stream.Stream;
  * @author sgrostad
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class NodeRepoJsonModel {
+public class NodeSpec {
 
     @JsonProperty("minDiskAvailableGb")
     private double minDiskAvailableGb;
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/Reporter.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/Reporter.java
index 11835cab14b..cc9dee38dea 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/Reporter.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/Reporter.java
@@ -3,11 +3,10 @@ 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.noderepo.NodeSpec;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -46,16 +45,16 @@ public class Reporter {
     }
 
     private static HardwareDivergenceReport generateHardwareDivergenceReport(List<URL> nodeInfoUrls) throws IOException {
-        NodeRepoJsonModel nodeRepoJsonModel = NodeRepoInfoRetriever.retrieve(nodeInfoUrls);
+        NodeSpec nodeSpec = NodeRepoInfoRetriever.retrieve(nodeInfoUrls);
         ObjectMapper om = new ObjectMapper();
-        if (nodeRepoJsonModel.getHardwareDivergence() == null || nodeRepoJsonModel.getHardwareDivergence().equals("null")) {
+        if (nodeSpec.getHardwareDivergence() == null || nodeSpec.getHardwareDivergence().equals("null")) {
             return new HardwareDivergenceReport();
         }
         try {
-            HardwareDivergenceReport hardwareDivergenceReport = om.readValue(nodeRepoJsonModel.getHardwareDivergence(), HardwareDivergenceReport.class);
+            HardwareDivergenceReport hardwareDivergenceReport = om.readValue(nodeSpec.getHardwareDivergence(), HardwareDivergenceReport.class);
             return hardwareDivergenceReport;
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Failed to parse hardware divergence report from node repo. Report:\n" + nodeRepoJsonModel.getHardwareDivergence(), e.getMessage());
+            logger.log(Level.WARNING, "Failed to parse hardware divergence report from node repo. Report:\n" + nodeSpec.getHardwareDivergence(), e.getMessage());
             return new HardwareDivergenceReport();
         }
     }
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 e4cae4d7e9e..0e425413c1c 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
@@ -7,7 +7,7 @@ import com.yahoo.vespa.hosted.node.verification.commons.HostURLGenerator;
 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;
-import com.yahoo.vespa.hosted.node.verification.commons.noderepo.NodeRepoJsonModel;
+import com.yahoo.vespa.hosted.node.verification.commons.noderepo.NodeSpec;
 import com.yahoo.vespa.hosted.node.verification.commons.report.Reporter;
 import com.yahoo.vespa.hosted.node.verification.commons.report.SpecVerificationReport;
 import com.yahoo.vespa.hosted.node.verification.spec.retrievers.HardwareInfo;
@@ -15,7 +15,6 @@ import com.yahoo.vespa.hosted.node.verification.spec.retrievers.HardwareInfoRetr
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -32,24 +31,24 @@ public class SpecVerifier {
     private static final Logger logger = Logger.getLogger(SpecVerifier.class.getName());
 
     public static boolean verifySpec(CommandExecutor commandExecutor, List<URL> nodeInfoUrls) throws IOException {
-        NodeRepoJsonModel nodeRepoJsonModel = getNodeRepositoryJSON(nodeInfoUrls);
-        VerifierSettings verifierSettings = new VerifierSettings(nodeRepoJsonModel);
+        NodeSpec nodeSpec = getNodeRepositoryJSON(nodeInfoUrls);
+        VerifierSettings verifierSettings = new VerifierSettings(nodeSpec);
         HardwareInfo actualHardware = HardwareInfoRetriever.retrieve(commandExecutor, verifierSettings);
-        SpecVerificationReport specVerificationReport = makeVerificationReport(actualHardware, nodeRepoJsonModel);
+        SpecVerificationReport specVerificationReport = makeVerificationReport(actualHardware, nodeSpec);
         Reporter.reportSpecVerificationResults(specVerificationReport, nodeInfoUrls);
         return specVerificationReport.isValidSpec();
     }
 
-    protected static SpecVerificationReport makeVerificationReport(HardwareInfo actualHardware, NodeRepoJsonModel nodeRepoJsonModel) {
-        SpecVerificationReport specVerificationReport = HardwareNodeComparator.compare(NodeJsonConverter.convertJsonModelToHardwareInfo(nodeRepoJsonModel), actualHardware);
+    protected static SpecVerificationReport makeVerificationReport(HardwareInfo actualHardware, NodeSpec nodeSpec) {
+        SpecVerificationReport specVerificationReport = HardwareNodeComparator.compare(NodeJsonConverter.convertJsonModelToHardwareInfo(nodeSpec), actualHardware);
         IPAddressVerifier ipAddressVerifier = new IPAddressVerifier();
-        ipAddressVerifier.reportFaultyIpAddresses(nodeRepoJsonModel, specVerificationReport);
+        ipAddressVerifier.reportFaultyIpAddresses(nodeSpec, specVerificationReport);
         return specVerificationReport;
     }
 
-    protected static NodeRepoJsonModel getNodeRepositoryJSON(List<URL> nodeInfoUrls) throws IOException {
-        NodeRepoJsonModel nodeRepoJsonModel = NodeRepoInfoRetriever.retrieve(nodeInfoUrls);
-        return nodeRepoJsonModel;
+    protected static NodeSpec getNodeRepositoryJSON(List<URL> nodeInfoUrls) throws IOException {
+        NodeSpec nodeSpec = NodeRepoInfoRetriever.retrieve(nodeInfoUrls);
+        return nodeSpec;
     }
 
     public static void main(String[] args) {
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 2b5a19ce818..f2e78d672cb 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
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.verification.spec;
 
-import com.yahoo.vespa.hosted.node.verification.commons.noderepo.NodeRepoJsonModel;
+import com.yahoo.vespa.hosted.node.verification.commons.noderepo.NodeSpec;
 
 /**
  * Contains information on what spec should be verified or not.
@@ -17,8 +17,8 @@ public class VerifierSettings {
         this.checkIPv6 = true;
     }
 
-    public VerifierSettings(NodeRepoJsonModel nodeRepoJsonModel) {
-        checkIPv6 = nodeRepoJsonModel.getIpv6Address() != null;
+    public VerifierSettings(NodeSpec nodeSpec) {
+        checkIPv6 = nodeSpec.getIpv6Address() != null;
     }
 
     public boolean isCheckIPv6() {
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifierTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifierTest.java
index 197b4836bc8..3fcf99dfe85 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifierTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifierTest.java
@@ -24,7 +24,7 @@ public class IPAddressVerifierTest {
     private IPAddressVerifier ipAddressVerifier = spy(new IPAddressVerifier());
     private String ipv4Address;
     private String ipv6Address;
-    private NodeRepoJsonModel nodeRepoJsonModel;
+    private NodeSpec nodeSpec;
     private static final String ABSOLUTE_PATH = Paths.get(".").toAbsolutePath().normalize().toString();
     private static final String RESOURCE_PATH = "src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json";
     private static final String URL_RESOURCE_PATH = "file://" + ABSOLUTE_PATH + "/" + RESOURCE_PATH;
@@ -36,7 +36,7 @@ public class IPAddressVerifierTest {
         ipv4Address = "172.16.254.1";
         ipv6Address = "2001:db8:0:1234:0:567:8:1";
         ArrayList<URL> nodeRepoUrl = new ArrayList<>(Arrays.asList(new URL(URL_RESOURCE_PATH)));
-        nodeRepoJsonModel = NodeRepoInfoRetriever.retrieve(nodeRepoUrl);
+        nodeSpec = NodeRepoInfoRetriever.retrieve(nodeRepoUrl);
         ipv4LookupFormat = "1.254.16.172.in-addr.arpa";
         ipv6LookupFormat = "1.0.0.0.8.0.0.0.7.6.5.0.0.0.0.0.4.3.2.1.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa";
     }
@@ -47,7 +47,7 @@ public class IPAddressVerifierTest {
         String wrongHostName = "www.yahoo.com";
         doReturn(realHostName).when(ipAddressVerifier).reverseLookUp(ipv4LookupFormat);
         doReturn(wrongHostName).when(ipAddressVerifier).reverseLookUp(ipv6LookupFormat);
-        String[] faultyIpAddresses = ipAddressVerifier.getFaultyIpAddresses(nodeRepoJsonModel);
+        String[] faultyIpAddresses = ipAddressVerifier.getFaultyIpAddresses(nodeSpec);
         String[] expectedFaultyIpAddresses = new String[]{ipv6Address};
         assertArrayEquals(expectedFaultyIpAddresses, faultyIpAddresses);
     }
@@ -57,7 +57,7 @@ public class IPAddressVerifierTest {
         String realHostName = "host.name";
         doReturn(realHostName).when(ipAddressVerifier).reverseLookUp(ipv4LookupFormat);
         doReturn(realHostName).when(ipAddressVerifier).reverseLookUp(ipv6LookupFormat);
-        String[] faultyIpAddresses = ipAddressVerifier.getFaultyIpAddresses(nodeRepoJsonModel);
+        String[] faultyIpAddresses = ipAddressVerifier.getFaultyIpAddresses(nodeSpec);
         String[] expectedFaultyIpAddresses = new String[]{};
         assertArrayEquals(expectedFaultyIpAddresses, faultyIpAddresses);
     }
@@ -76,7 +76,7 @@ public class IPAddressVerifierTest {
 
     @Test
     public void getFaultyIpAddresses_should_return_empty_array_when_parameters_are_invalid() {
-        assertEquals(0, ipAddressVerifier.getFaultyIpAddresses(new NodeRepoJsonModel()).length);
+        assertEquals(0, ipAddressVerifier.getFaultyIpAddresses(new NodeSpec()).length);
     }
 
 }
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeJsonConverterTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeJsonConverterTest.java
index 0940efd08d3..0f27aeee098 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeJsonConverterTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeJsonConverterTest.java
@@ -26,8 +26,8 @@ public class NodeJsonConverterTest {
     @Test
     public void convertJsonModel_should_return_correct_HardwareInfo() throws Exception {
         List<URL> urls = new ArrayList<>(Arrays.asList(new File("src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoTest.json").toURI().toURL()));
-        NodeRepoJsonModel nodeRepoJsonModel = NodeRepoInfoRetriever.retrieve(urls);
-        HardwareInfo hardwareInfo = NodeJsonConverter.convertJsonModelToHardwareInfo(nodeRepoJsonModel);
+        NodeSpec nodeSpec = NodeRepoInfoRetriever.retrieve(urls);
+        HardwareInfo hardwareInfo = NodeJsonConverter.convertJsonModelToHardwareInfo(nodeSpec);
         double expectedMinDiskAvailable = 500.0;
         double expectedMinMainMemoryAvailable = 24.0;
         double expectedMinCpuCores = 24.0;
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoInfoRetrieverTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoInfoRetrieverTest.java
index 97bf3fdeb11..1e1bd7e71d6 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoInfoRetrieverTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/NodeRepoInfoRetrieverTest.java
@@ -37,13 +37,13 @@ public class NodeRepoInfoRetrieverTest {
     @Test
     public void retrieve_should_return_nodeJSONModel_when_parameter_contains_valid_url() throws IOException {
         urls.add(new URL(URL_RESOURCE_PATH + "/nodeInfoTest.json"));
-        NodeRepoJsonModel nodeRepoJsonModel = NodeRepoInfoRetriever.retrieve(urls);
+        NodeSpec nodeSpec = NodeRepoInfoRetriever.retrieve(urls);
         double expectedMinDiskAvailable = 500.0;
         double expectedMinMainMemoryAvailable = 24.0;
         double expectedMinCpuCores = 24.0;
-        assertEquals(expectedMinDiskAvailable, nodeRepoJsonModel.getMinDiskAvailableGb(), DELTA);
-        assertEquals(expectedMinMainMemoryAvailable, nodeRepoJsonModel.getMinMainMemoryAvailableGb(), DELTA);
-        assertEquals(expectedMinCpuCores, nodeRepoJsonModel.getMinCpuCores(), DELTA);
+        assertEquals(expectedMinDiskAvailable, nodeSpec.getMinDiskAvailableGb(), DELTA);
+        assertEquals(expectedMinMainMemoryAvailable, nodeSpec.getMinMainMemoryAvailableGb(), DELTA);
+        assertEquals(expectedMinCpuCores, nodeSpec.getMinCpuCores(), DELTA);
     }
 
     @Test
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 16e72521853..f2e3e9ce707 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
@@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.node.verification.spec;
 
 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.noderepo.NodeSpec;
 import com.yahoo.vespa.hosted.node.verification.commons.report.SpecVerificationReport;
 import com.yahoo.vespa.hosted.node.verification.mock.MockCommandExecutor;
 import com.yahoo.vespa.hosted.node.verification.spec.retrievers.HardwareInfo;
@@ -90,8 +90,8 @@ public class SpecVerifierTest {
         actualHardware.setIpv6Connection(true);
         actualHardware.setDiskType(HardwareInfo.DiskType.SLOW);
         nodeInfoUrls.add(new File(NODE_REPO_PATH).toURI().toURL());
-        NodeRepoJsonModel nodeRepoJsonModel = NodeRepoInfoRetriever.retrieve(nodeInfoUrls);
-        SpecVerificationReport verificationSpecVerificationReport = SpecVerifier.makeVerificationReport(actualHardware, nodeRepoJsonModel);
+        NodeSpec nodeSpec = NodeRepoInfoRetriever.retrieve(nodeInfoUrls);
+        SpecVerificationReport verificationSpecVerificationReport = SpecVerifier.makeVerificationReport(actualHardware, nodeSpec);
         String expectedJson = "{\"actualInterfaceSpeed\":100.0}";
         ObjectMapper om = new ObjectMapper();
         String actualJson = om.writeValueAsString(verificationSpecVerificationReport);
@@ -101,15 +101,15 @@ public class SpecVerifierTest {
     @Test
     public void getNodeRepositoryJSON_should_return_valid_nodeRepoJSONModel() throws Exception {
         nodeInfoUrls.add(new URL(URL_RESOURCE_PATH + "/nodeRepo.json"));
-        NodeRepoJsonModel actualNodeRepoJsonModel = SpecVerifier.getNodeRepositoryJSON(nodeInfoUrls);
+        NodeSpec actualNodeSpec = SpecVerifier.getNodeRepositoryJSON(nodeInfoUrls);
         double expectedMinCpuCores = 4D;
         double expectedMinMainMemoryAvailableGb = 4.04D;
         double expectedMinDiskAvailableGb = 1759.84;
         boolean expectedFastDisk = true;
-        assertEquals(expectedMinCpuCores, actualNodeRepoJsonModel.getMinCpuCores(), DELTA);
-        assertEquals(expectedMinMainMemoryAvailableGb, actualNodeRepoJsonModel.getMinMainMemoryAvailableGb(), DELTA);
-        assertEquals(expectedMinDiskAvailableGb, actualNodeRepoJsonModel.getMinDiskAvailableGb(), DELTA);
-        assertEquals(expectedFastDisk, actualNodeRepoJsonModel.isFastDisk());
+        assertEquals(expectedMinCpuCores, actualNodeSpec.getMinCpuCores(), DELTA);
+        assertEquals(expectedMinMainMemoryAvailableGb, actualNodeSpec.getMinMainMemoryAvailableGb(), DELTA);
+        assertEquals(expectedMinDiskAvailableGb, actualNodeSpec.getMinDiskAvailableGb(), DELTA);
+        assertEquals(expectedFastDisk, actualNodeSpec.isFastDisk());
     }
 
 }