Replace OsVersion.Node with NodeVersion

2 files changed, 62 insertions, 16 deletions

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 5073f651fd3..c60137e47b4 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
@@ -1,18 +1,23 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.persistence;
 
+import com.google.common.collect.ImmutableMap;
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.CloudName;
-import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostName;
-import com.yahoo.config.provision.RegionName;
+import com.yahoo.config.provision.zone.ZoneId;
+import com.yahoo.vespa.config.SlimeUtils;
+import com.yahoo.vespa.hosted.controller.versions.NodeVersion;
+import com.yahoo.vespa.hosted.controller.versions.NodeVersions;
 import com.yahoo.vespa.hosted.controller.versions.OsVersion;
 import com.yahoo.vespa.hosted.controller.versions.OsVersionStatus;
 import org.junit.Test;
 
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.time.Instant;
 import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,22 +30,41 @@ public class OsVersionStatusSerializerTest {
     public void test_serialization() {
         Version version1 = Version.fromString("7.1");
         Version version2 = Version.fromString("7.2");
-        Map<OsVersion, List<OsVersionStatus.Node>> versions = new TreeMap<>();
+        var versions = ImmutableMap.<OsVersion, NodeVersions>builder();
 
-        versions.put(new OsVersion(version1, CloudName.defaultName()), List.of(
-                new OsVersionStatus.Node(HostName.from("node1"), version1, Environment.prod, RegionName.from("us-west")),
-                new OsVersionStatus.Node(HostName.from("node2"), version1, Environment.prod, RegionName.from("us-east"))
-        ));
-        versions.put(new OsVersion(version2, CloudName.defaultName()), List.of(
-                new OsVersionStatus.Node(HostName.from("node3"), version2, Environment.prod, RegionName.from("us-west")),
-                new OsVersionStatus.Node(HostName.from("node4"), version2, Environment.prod, RegionName.from("us-east"))
+        versions.put(new OsVersion(version1, CloudName.defaultName()), NodeVersions.EMPTY.with(List.of(
+                new NodeVersion(HostName.from("node1"), ZoneId.from("prod", "us-west"), version1, version2, Instant.ofEpochMilli(1)),
+                new NodeVersion(HostName.from("node2"), ZoneId.from("prod", "us-east"), version1, version2, Instant.ofEpochMilli(2))
+        )));
+        versions.put(new OsVersion(version2, CloudName.defaultName()), NodeVersions.EMPTY.with(List.of(
+                new NodeVersion(HostName.from("node3"), ZoneId.from("prod", "us-west"), version2, version2, Instant.ofEpochMilli(3)),
+                new NodeVersion(HostName.from("node4"), ZoneId.from("prod", "us-east"), version2, version2, Instant.ofEpochMilli(4))
+        )));
 
-        ));
-
-        OsVersionStatusSerializer serializer = new OsVersionStatusSerializer(new OsVersionSerializer());
-        OsVersionStatus status = new OsVersionStatus(versions);
+        OsVersionStatusSerializer serializer = new OsVersionStatusSerializer(new OsVersionSerializer(), new NodeVersionSerializer());
+        OsVersionStatus status = new OsVersionStatus(versions.build());
         OsVersionStatus serialized = serializer.fromSlime(serializer.toSlime(status));
         assertEquals(status.versions(), serialized.versions());
     }
 
+    @Test
+    public void testLegacySerialization() throws Exception {
+        var data = Files.readAllBytes(Paths.get("src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/os-version-status-legacy-format.json"));
+        var serializer = new OsVersionStatusSerializer(new OsVersionSerializer(), new NodeVersionSerializer());
+        var versions = ImmutableMap.of(
+                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"),
+                                                                Version.fromString("7.42"), Version.emptyVersion, Instant.EPOCH))));
+
+        var deserialized = serializer.fromSlime(SlimeUtils.jsonToSlime(data));
+        assertEquals(versions, deserialized.versions());
+
+
+        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\"}]}]}",
+                     serialized);
+    }
+
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/os-version-status-legacy-format.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/os-version-status-legacy-format.json
new file mode 100644
index 00000000000..5a6a864cbf8
--- /dev/null
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/os-version-status-legacy-format.json
@@ -0,0 +1,22 @@
+{
+  "versions": [
+    {
+      "version": "7.42",
+      "cloud": "yahoo",
+      "nodes": [
+        {
+          "hostname": "node1",
+          "version": "7.42",
+          "region": "us-north-1",
+          "environment": "prod"
+        },
+        {
+          "hostname": "node2",
+          "version": "7.42",
+          "region": "us-north-2",
+          "environment": "test"
+        }
+      ]
+    }
+  ]
+}