Remove deprecated field

3 files changed, 1 insertions, 22 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
index 76616a3a8f5..f7f231d5e0c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
@@ -27,7 +27,6 @@ public class NodeSpec {
     private final NodeState state;
     private final NodeType type;
     private final String flavor;
-    private final Optional<Double> cpuCores;
 
     private final Optional<DockerImage> wantedDockerImage;
     private final Optional<DockerImage> currentDockerImage;
@@ -68,7 +67,6 @@ public class NodeSpec {
             NodeState state,
             NodeType type,
             String flavor,
-            Optional<Double> cpuCores,
             Optional<Version> wantedVespaVersion,
             Optional<Version> currentVespaVersion,
             Optional<Version> wantedOsVersion,
@@ -103,7 +101,6 @@ public class NodeSpec {
         this.state = Objects.requireNonNull(state);
         this.type = Objects.requireNonNull(type);
         this.flavor = Objects.requireNonNull(flavor);
-        this.cpuCores = Objects.requireNonNull(cpuCores);
         this.modelName = Objects.requireNonNull(modelName);
         this.wantedVespaVersion = Objects.requireNonNull(wantedVespaVersion);
         this.currentVespaVersion = Objects.requireNonNull(currentVespaVersion);
@@ -141,10 +138,6 @@ public class NodeSpec {
         return flavor;
     }
 
-    public Optional<Double> cpuCores() {
-        return cpuCores;
-    }
-
     public Optional<DockerImage> wantedDockerImage() {
         return wantedDockerImage;
     }
@@ -264,7 +257,6 @@ public class NodeSpec {
                 Objects.equals(state, that.state) &&
                 Objects.equals(type, that.type) &&
                 Objects.equals(flavor, that.flavor) &&
-                Objects.equals(cpuCores, that.cpuCores) &&
                 Objects.equals(wantedVespaVersion, that.wantedVespaVersion) &&
                 Objects.equals(currentVespaVersion, that.currentVespaVersion) &&
                 Objects.equals(wantedOsVersion, that.wantedOsVersion) &&
@@ -294,7 +286,6 @@ public class NodeSpec {
                 state,
                 type,
                 flavor,
-                cpuCores,
                 wantedVespaVersion,
                 currentVespaVersion,
                 wantedOsVersion,
@@ -324,7 +315,6 @@ public class NodeSpec {
                 + " state=" + state
                 + " type=" + type
                 + " flavor=" + flavor
-                + " cpuCores=" + cpuCores
                 + " wantedVespaVersion=" + wantedVespaVersion
                 + " currentVespaVersion=" + currentVespaVersion
                 + " wantedOsVersion=" + wantedOsVersion
@@ -351,7 +341,6 @@ public class NodeSpec {
         private NodeState state;
         private NodeType type;
         private String flavor;
-        private Optional<Double> cpuCores = Optional.empty();
         private Optional<DockerImage> wantedDockerImage = Optional.empty();
         private Optional<DockerImage> currentDockerImage = Optional.empty();
         private Optional<Version> wantedVespaVersion = Optional.empty();
@@ -387,7 +376,6 @@ public class NodeSpec {
             wantedRebootGeneration(node.wantedRebootGeneration);
             currentRebootGeneration(node.currentRebootGeneration);
             reports(new NodeReports(node.reports));
-            node.cpuCores.ifPresent(this::cpuCores);
             node.wantedDockerImage.ifPresent(this::wantedDockerImage);
             node.currentDockerImage.ifPresent(this::currentDockerImage);
             node.wantedVespaVersion.ifPresent(this::wantedVespaVersion);
@@ -434,11 +422,6 @@ public class NodeSpec {
             return this;
         }
 
-        public Builder cpuCores(double cpuCores) {
-            this.cpuCores = Optional.of(cpuCores);
-            return this;
-        }
-
         public Builder wantedVespaVersion(Version wantedVespaVersion) {
             this.wantedVespaVersion = Optional.of(wantedVespaVersion);
             return this;
@@ -658,7 +641,7 @@ public class NodeSpec {
         }
 
         public NodeSpec build() {
-            return new NodeSpec(hostname, wantedDockerImage, currentDockerImage, state, type, flavor, cpuCores,
+            return new NodeSpec(hostname, wantedDockerImage, currentDockerImage, state, type, flavor,
                     wantedVespaVersion, currentVespaVersion, wantedOsVersion, currentOsVersion, allowedToBeDown,
                     owner, membership,
                     wantedRestartGeneration, currentRestartGeneration,
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
index ea737773289..2e47410f1b5 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
@@ -157,7 +157,6 @@ public class RealNodeRepository implements NodeRepository {
                 nodeState,
                 nodeType,
                 node.flavor,
-                Optional.ofNullable(node.cpuCores),
                 Optional.ofNullable(node.wantedVespaVersion).map(Version::fromString),
                 Optional.ofNullable(node.vespaVersion).map(Version::fromString),
                 Optional.ofNullable(node.wantedOsVersion).map(Version::fromString),
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java
index 4c1f74290e9..932c1384e7e 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java
@@ -28,8 +28,6 @@ public class NodeRepositoryNode {
     public String openStackId;
     @JsonProperty("flavor")
     public String flavor;
-    @JsonProperty("cpuCores")
-    public Double cpuCores;
     @JsonProperty("resources")
     public NodeResources resources;
     @JsonProperty("membership")
@@ -92,7 +90,6 @@ public class NodeRepositoryNode {
                 ", openStackId='" + openStackId + '\'' +
                 ", modelName='" + modelName + '\'' +
                 ", flavor='" + flavor + '\'' +
-                ", cpuCores=" + cpuCores +
                 ", resources=" + resources +
                 ", membership=" + membership +
                 ", owner=" + owner +