Update equals/hashCode

2 files changed, 5 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java
index 5e463e04322..8d0232afa58 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java
@@ -75,7 +75,7 @@ public class NodeVersion {
 
     @Override
     public String toString() {
-        return hostname + ": " + currentVersion + " -> " + wantedVersion + " [changedAt=" + changedAt + "]";
+        return hostname + ": " + currentVersion + " -> " + wantedVersion + " [zone=" + zone + ", changedAt=" + changedAt + "]";
     }
 
     @Override
@@ -84,6 +84,7 @@ public class NodeVersion {
         if (o == null || getClass() != o.getClass()) return false;
         NodeVersion that = (NodeVersion) o;
         return hostname.equals(that.hostname) &&
+               zone.equals(that.zone) &&
                currentVersion.equals(that.currentVersion) &&
                wantedVersion.equals(that.wantedVersion) &&
                changedAt.equals(that.changedAt);
@@ -91,7 +92,7 @@ public class NodeVersion {
 
     @Override
     public int hashCode() {
-        return Objects.hash(hostname, currentVersion, wantedVersion, changedAt);
+        return Objects.hash(hostname, zone, currentVersion, wantedVersion, changedAt);
     }
 
     public static NodeVersion empty(HostName hostname) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java
index c60137e47b4..ba771d70d26 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java
@@ -55,7 +55,7 @@ public class OsVersionStatusSerializerTest {
                 new OsVersion(Version.fromString("7.42"), CloudName.from("yahoo")),
                 NodeVersions.EMPTY.with(List.of(new NodeVersion(HostName.from("node1"), ZoneId.from("prod", "us-north-1"),
                                                                 Version.fromString("7.42"), Version.emptyVersion, Instant.EPOCH),
-                                                new NodeVersion(HostName.from("node2"), ZoneId.from("prod", "us-north-2"),
+                                                new NodeVersion(HostName.from("node2"), ZoneId.from("test", "us-north-2"),
                                                                 Version.fromString("7.42"), Version.emptyVersion, Instant.EPOCH))));
 
         var deserialized = serializer.fromSlime(SlimeUtils.jsonToSlime(data));
@@ -63,7 +63,7 @@ public class OsVersionStatusSerializerTest {
 
 
         var serialized = new String(SlimeUtils.toJsonBytes(serializer.toSlime(new OsVersionStatus(versions))), StandardCharsets.UTF_8);
-        assertEquals("{\"versions\":[{\"version\":\"7.42.0\",\"cloud\":\"yahoo\",\"nodeVersions\":[{\"hostname\":\"node1\",\"zone\":\"prod.us-north-1\",\"wantedVersion\":\"0.0.0\",\"changedAt\":0},{\"hostname\":\"node2\",\"zone\":\"prod.us-north-2\",\"wantedVersion\":\"0.0.0\",\"changedAt\":0}],\"nodes\":[{\"hostname\":\"node1\",\"version\":\"7.42.0\",\"region\":\"us-north-1\",\"environment\":\"prod\"},{\"hostname\":\"node2\",\"version\":\"7.42.0\",\"region\":\"us-north-2\",\"environment\":\"prod\"}]}]}",
+        assertEquals("{\"versions\":[{\"version\":\"7.42.0\",\"cloud\":\"yahoo\",\"nodeVersions\":[{\"hostname\":\"node1\",\"zone\":\"prod.us-north-1\",\"wantedVersion\":\"0.0.0\",\"changedAt\":0},{\"hostname\":\"node2\",\"zone\":\"test.us-north-2\",\"wantedVersion\":\"0.0.0\",\"changedAt\":0}],\"nodes\":[{\"hostname\":\"node1\",\"version\":\"7.42.0\",\"region\":\"us-north-1\",\"environment\":\"prod\"},{\"hostname\":\"node2\",\"version\":\"7.42.0\",\"region\":\"us-north-2\",\"environment\":\"test\"}]}]}",
                      serialized);
     }