Merge pull request #28908 from vespa-engine/jonmv/read-node-exclusive-to

Read and write exclusiveTo and provisionedFor separately

3 files changed, 4 insertions, 4 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index 40d8394142b..5efe5d8b2a8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -283,7 +283,7 @@ public class NodeSerializer {
                         SlimeUtils.optionalString(object.field(modelNameKey)),
                         SlimeUtils.optionalString(object.field(reservedToKey)).map(TenantName::from),
                         SlimeUtils.optionalString(object.field(exclusiveToApplicationIdKey)).map(ApplicationId::fromSerializedForm),
-                        SlimeUtils.optionalString(object.field(exclusiveToApplicationIdKey)).map(ApplicationId::fromSerializedForm), // TODO: change to provisionedForApplicationIdKey
+                        SlimeUtils.optionalString(object.field(provisionedForApplicationIdKey)).map(ApplicationId::fromSerializedForm),
                         SlimeUtils.optionalDuration(object.field(hostTTLKey)),
                         SlimeUtils.optionalInstant(object.field(hostEmptyAtKey)),
                         SlimeUtils.optionalString(object.field(exclusiveToClusterTypeKey)).map(ClusterSpec.Type::from),
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
index 4aab8b683b0..0fbbefa39bb 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
@@ -483,7 +483,7 @@ public class NodeSerializerTest {
         ApplicationId provisionedForApp = ApplicationId.from("tenant1", "app1", "instance1");
         node = nodeSerializer.fromJson(nodeSerializer.toJson(builder.exclusiveToApplicationId(provisionedForApp).build()));
         assertEquals(Optional.of(provisionedForApp), node.exclusiveToApplicationId());
-        // assertEquals(Optional.empty(), node.provisionedForApplicationId()); TODO: enable once serialisation phase 1 is done
+        assertEquals(Optional.empty(), node.provisionedForApplicationId());
 
         ClusterSpec.Type exclusiveToCluster = ClusterSpec.Type.admin;
         node = builder.provisionedForApplicationId(provisionedForApp)
@@ -513,7 +513,7 @@ public class NodeSerializerTest {
         CloudAccount account = CloudAccount.from("012345678912");
         Node node = Node.create("id", "host1.example.com", nodeFlavors.getFlavorOrThrow("default"), State.provisioned, NodeType.host)
                         .cloudAccount(account)
-                        .exclusiveToApplicationId(ApplicationId.defaultId())
+                        .provisionedForApplicationId(ApplicationId.defaultId())
                         .build();
         node = nodeSerializer.fromJson(nodeSerializer.toJson(node));
         assertEquals(account, node.cloudAccount());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
index 72c1e2e4ec3..9a7d2252b0e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
@@ -1103,7 +1103,7 @@ public class NodesV2ApiTest {
                createIpAddresses(ipAddress) +
                "\"flavor\":\"" + flavor + "\"" +
                (reservedTo.map(tenantName -> ", \"reservedTo\":\"" + tenantName.value() + "\"").orElse("")) +
-               (exclusiveTo.map(appId -> ", \"exclusiveTo\":\"" + appId.serializedForm() + "\"").orElse("")) +
+               (exclusiveTo.map(appId -> ", \"provisionedFor\":\"" + appId.serializedForm() + "\"").orElse("")) +
                (switchHostname.map(s -> ", \"switchHostname\":\"" + s + "\"").orElse("")) +
                (additionalIpAddresses.isEmpty() ? "" : ", \"additionalIpAddresses\":[\"" + String.join("\",\"", additionalIpAddresses) + "\"]") +
                (additionalHostnames.isEmpty() ? "" : ", \"additionalHostnames\":[\"" + String.join("\",\"", additionalHostnames) + "\"]") +