Remove unused option hardwareDivergence

2 files changed, 3 insertions, 16 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 7a40a162937..4770b3a3226 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> hardwareDivergence = 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. */
@@ -119,10 +118,6 @@ public class NodeAttributes {
         return currentFirmwareCheck;
     }
 
-    public Optional<String> getHardwareDivergence() {
-        return hardwareDivergence;
-    }
-
     public Optional<String> getHardwareFailureDescription() {
         return hardwareFailureDescription;
     }
@@ -138,7 +133,7 @@ public class NodeAttributes {
     @Override
     public int hashCode() {
         return Objects.hash(restartGeneration, rebootGeneration, dockerImage, vespaVersion, currentOsVersion,
-                currentFirmwareCheck, hardwareDivergence, hardwareFailureDescription, wantToDeprovision, reports);
+                currentFirmwareCheck, hardwareFailureDescription, wantToDeprovision, reports);
     }
 
     public boolean isEmpty() {
@@ -158,7 +153,6 @@ public class NodeAttributes {
                 && Objects.equals(vespaVersion, other.vespaVersion)
                 && Objects.equals(currentOsVersion, other.currentOsVersion)
                 && Objects.equals(currentFirmwareCheck, other.currentFirmwareCheck)
-                && Objects.equals(hardwareDivergence, other.hardwareDivergence)
                 && Objects.equals(hardwareFailureDescription, other.hardwareFailureDescription)
                 && Objects.equals(reports, other.reports)
                 && Objects.equals(wantToDeprovision, other.wantToDeprovision);
@@ -173,7 +167,6 @@ public class NodeAttributes {
                         vespaVersion.map(ver -> "vespaVersion=" + ver.toFullString()),
                         currentOsVersion.map(ver -> "currentOsVersion=" + ver.toFullString()),
                         currentFirmwareCheck.map(at -> "currentFirmwareCheck=" + at),
-                        hardwareDivergence.map(hwDivg -> "hardwareDivergence=" + hwDivg),
                         hardwareFailureDescription.map(hwDesc -> "hardwareFailureDescription=" + hwDesc),
                         Optional.ofNullable(reports.isEmpty() ? null : "reports=" + reports),
                         wantToDeprovision.map(depr -> "wantToDeprovision=" + depr))
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 bdb0f889b93..29b82cbbecd 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
@@ -7,7 +7,6 @@ import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.NodeType;
 
 import java.time.Instant;
-import java.util.Collections;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -385,8 +384,7 @@ public class NodeSpec {
         private double minDiskAvailableGb;
         private boolean fastDisk = false;
         private double bandwidth;
-        private Set<String> ipAddresses = Collections.emptySet();
-        private Optional<String> hardwareDivergence = Optional.empty();
+        private Set<String> ipAddresses = Set.of();
         private Optional<String> hardwareFailureDescription = Optional.empty();
         private NodeReports reports = new NodeReports();
         private Optional<String> parentHostname = Optional.empty();
@@ -405,6 +403,7 @@ public class NodeSpec {
             fastDisk(node.fastDisk);
             bandwidth(node.bandwidth);
             ipAddresses(node.ipAddresses);
+            additionalIpAddresses(node.additionalIpAddresses);
             wantedRebootGeneration(node.wantedRebootGeneration);
             currentRebootGeneration(node.currentRebootGeneration);
             reports(new NodeReports(node.reports));
@@ -562,11 +561,6 @@ public class NodeSpec {
             return this;
         }
 
-        public Builder hardwareDivergence(String hardwareDivergence) {
-            this.hardwareDivergence = Optional.of(hardwareDivergence);
-            return this;
-        }
-
         public Builder hardwareFailureDescription(String hardwareFailureDescription) {
             this.hardwareFailureDescription = Optional.of(hardwareFailureDescription);
             return this;