Remove unused fields

4 files changed, 2 insertions, 43 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java
index 4770b3a3226..5317aa74737 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java
@@ -28,7 +28,6 @@ public class NodeAttributes {
     private Optional<Version> vespaVersion = Optional.empty();
     private Optional<Version> currentOsVersion = Optional.empty();
     private Optional<Instant> currentFirmwareCheck = Optional.empty();
-    private Optional<String> hardwareFailureDescription = Optional.empty();
     private Optional<Boolean> wantToDeprovision = Optional.empty();
     /** The list of reports to patch. A null value is used to remove the report. */
     private Map<String, JsonNode> reports = new TreeMap<>();
@@ -69,10 +68,6 @@ public class NodeAttributes {
         return this;
     }
 
-    public NodeAttributes withHardwareFailureDescription(String hardwareFailureDescription) {
-        this.hardwareFailureDescription = Optional.of(hardwareFailureDescription);
-        return this;
-    }
 
     public NodeAttributes withWantToDeprovision(boolean wantToDeprovision) {
         this.wantToDeprovision = Optional.of(wantToDeprovision);
@@ -118,10 +113,6 @@ public class NodeAttributes {
         return currentFirmwareCheck;
     }
 
-    public Optional<String> getHardwareFailureDescription() {
-        return hardwareFailureDescription;
-    }
-
     public Optional<Boolean> getWantToDeprovision() {
         return wantToDeprovision;
     }
@@ -133,7 +124,7 @@ public class NodeAttributes {
     @Override
     public int hashCode() {
         return Objects.hash(restartGeneration, rebootGeneration, dockerImage, vespaVersion, currentOsVersion,
-                currentFirmwareCheck, hardwareFailureDescription, wantToDeprovision, reports);
+                currentFirmwareCheck, wantToDeprovision, reports);
     }
 
     public boolean isEmpty() {
@@ -153,7 +144,6 @@ public class NodeAttributes {
                 && Objects.equals(vespaVersion, other.vespaVersion)
                 && Objects.equals(currentOsVersion, other.currentOsVersion)
                 && Objects.equals(currentFirmwareCheck, other.currentFirmwareCheck)
-                && Objects.equals(hardwareFailureDescription, other.hardwareFailureDescription)
                 && Objects.equals(reports, other.reports)
                 && Objects.equals(wantToDeprovision, other.wantToDeprovision);
     }
@@ -167,7 +157,6 @@ public class NodeAttributes {
                         vespaVersion.map(ver -> "vespaVersion=" + ver.toFullString()),
                         currentOsVersion.map(ver -> "currentOsVersion=" + ver.toFullString()),
                         currentFirmwareCheck.map(at -> "currentFirmwareCheck=" + at),
-                        hardwareFailureDescription.map(hwDesc -> "hardwareFailureDescription=" + hwDesc),
                         Optional.ofNullable(reports.isEmpty() ? null : "reports=" + reports),
                         wantToDeprovision.map(depr -> "wantToDeprovision=" + depr))
                 .filter(Optional::isPresent)
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 cdc90e214bd..d402e75ff7b 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
@@ -55,7 +55,6 @@ public class NodeSpec {
     private final Set<String> ipAddresses;
     private final Set<String> additionalIpAddresses;
 
-    private final Optional<String> hardwareFailureDescription;
     private final NodeReports reports;
 
     private final Optional<String> parentHostname;
@@ -90,7 +89,6 @@ public class NodeSpec {
             double bandwidth,
             Set<String> ipAddresses,
             Set<String> additionalIpAddresses,
-            Optional<String> hardwareFailureDescription,
             NodeReports reports,
             Optional<String> parentHostname) {
         this.hostname = Objects.requireNonNull(hostname);
@@ -122,7 +120,6 @@ public class NodeSpec {
         this.bandwidth = bandwidth;
         this.ipAddresses = Objects.requireNonNull(ipAddresses);
         this.additionalIpAddresses = Objects.requireNonNull(additionalIpAddresses);
-        this.hardwareFailureDescription = Objects.requireNonNull(hardwareFailureDescription);
         this.reports = Objects.requireNonNull(reports);
         this.parentHostname = Objects.requireNonNull(parentHostname);
     }
@@ -243,10 +240,6 @@ public class NodeSpec {
         return additionalIpAddresses;
     }
 
-    public Optional<String> getHardwareFailureDescription() {
-        return hardwareFailureDescription;
-    }
-
     public NodeReports getReports() { return reports; }
 
     public Optional<String> getParentHostname() {
@@ -288,7 +281,6 @@ public class NodeSpec {
                 Objects.equals(bandwidth, that.bandwidth) &&
                 Objects.equals(ipAddresses, that.ipAddresses) &&
                 Objects.equals(additionalIpAddresses, that.additionalIpAddresses) &&
-                Objects.equals(hardwareFailureDescription, that.hardwareFailureDescription) &&
                 Objects.equals(reports, that.reports) &&
                 Objects.equals(parentHostname, that.parentHostname);
     }
@@ -324,7 +316,6 @@ public class NodeSpec {
                 bandwidth,
                 ipAddresses,
                 additionalIpAddresses,
-                hardwareFailureDescription,
                 reports,
                 parentHostname);
     }
@@ -360,7 +351,6 @@ public class NodeSpec {
                 + " bandwidth=" + bandwidth
                 + " ipAddresses=" + ipAddresses
                 + " additionalIpAddresses=" + additionalIpAddresses
-                + " hardwareFailureDescription=" + hardwareFailureDescription
                 + " reports=" + reports
                 + " parentHostname=" + parentHostname
                 + " }";
@@ -396,7 +386,6 @@ public class NodeSpec {
         private double bandwidth;
         private Set<String> ipAddresses = Set.of();
         private Set<String> additionalIpAddresses = Set.of();
-        private Optional<String> hardwareFailureDescription = Optional.empty();
         private NodeReports reports = new NodeReports();
         private Optional<String> parentHostname = Optional.empty();
 
@@ -433,7 +422,6 @@ public class NodeSpec {
             node.currentRestartGeneration.ifPresent(this::currentRestartGeneration);
             node.wantedFirmwareCheck.ifPresent(this::wantedFirmwareCheck);
             node.currentFirmwareCheck.ifPresent(this::currentFirmwareCheck);
-            node.hardwareFailureDescription.ifPresent(this::hardwareFailureDescription);
             node.parentHostname.ifPresent(this::parentHostname);
         }
 
@@ -577,11 +565,6 @@ public class NodeSpec {
             return this;
         }
 
-        public Builder hardwareFailureDescription(String hardwareFailureDescription) {
-            this.hardwareFailureDescription = Optional.of(hardwareFailureDescription);
-            return this;
-        }
-
         public Builder reports(NodeReports reports) {
             this.reports = reports;
             return this;
@@ -607,7 +590,6 @@ public class NodeSpec {
             attributes.getCurrentOsVersion().ifPresent(this::currentOsVersion);
             attributes.getRebootGeneration().ifPresent(this::currentRebootGeneration);
             attributes.getRestartGeneration().ifPresent(this::currentRestartGeneration);
-            attributes.getHardwareFailureDescription().ifPresent(this::hardwareFailureDescription);
             attributes.getWantToDeprovision().ifPresent(this::wantToDeprovision);
             NodeReports.fromMap(attributes.getReports());
 
@@ -718,10 +700,6 @@ public class NodeSpec {
             return additionalIpAddresses;
         }
 
-        public Optional<String> getHardwareFailureDescription() {
-            return hardwareFailureDescription;
-        }
-
         public NodeReports getReports() {
             return reports;
         }
@@ -739,7 +717,7 @@ public class NodeSpec {
                     wantedRebootGeneration, currentRebootGeneration,
                     wantedFirmwareCheck, currentFirmwareCheck, modelName,
                     minCpuCores, minMainMemoryAvailableGb, minDiskAvailableGb,
-                    fastDisk, bandwidth, ipAddresses, additionalIpAddresses, hardwareFailureDescription,
+                    fastDisk, bandwidth, ipAddresses, additionalIpAddresses,
                     reports, parentHostname);
         }
 
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 ab14b8cba20..ca52eca13d2 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
@@ -201,7 +201,6 @@ public class RealNodeRepository implements NodeRepository {
                 node.bandwidth,
                 node.ipAddresses,
                 node.additionalIpAddresses,
-                Optional.ofNullable(node.hardwareFailureDescription),
                 reports,
                 Optional.ofNullable(node.parentHostname));
     }
@@ -226,7 +225,6 @@ public class RealNodeRepository implements NodeRepository {
         node.vespaVersion = nodeAttributes.getVespaVersion().map(Version::toFullString).orElse(null);
         node.currentOsVersion = nodeAttributes.getCurrentOsVersion().map(Version::toFullString).orElse(null);
         node.currentFirmwareCheck = nodeAttributes.getCurrentFirmwareCheck().map(Instant::toEpochMilli).orElse(null);
-        node.hardwareFailureDescription = nodeAttributes.getHardwareFailureDescription().orElse(null);
         node.wantToDeprovision = nodeAttributes.getWantToDeprovision().orElse(null);
 
         Map<String, JsonNode> reports = nodeAttributes.getReports();
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 a4cf61ef88f..2b4f9277fc7 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
@@ -62,10 +62,6 @@ public class NodeRepositoryNode {
     public Boolean fastDisk;
     @JsonProperty("bandwidth")
     public Double bandwidth;
-    @JsonProperty("hardwareFailure")
-    public Boolean hardwareFailure;
-    @JsonProperty("hardwareFailureDescription")
-    public String hardwareFailureDescription;
     @JsonProperty("environment")
     public String environment;
     @JsonProperty("type")
@@ -118,8 +114,6 @@ public class NodeRepositoryNode {
                 ", failCount=" + failCount +
                 ", fastDisk=" + fastDisk +
                 ", bandwidth=" + bandwidth +
-                ", hardwareFailure=" + hardwareFailure +
-                ", hardwareFailureDescription='" + hardwareFailureDescription + '\'' +
                 ", environment='" + environment + '\'' +
                 ", type='" + type + '\'' +
                 ", wantedDockerImage='" + wantedDockerImage + '\'' +