diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-12-03 13:30:46 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-12-03 13:30:53 +0100 |
| commit | 96bc3811c4cb5a40458110e7cf964960f78296a4 (patch) | |
| tree | bbef324891b563c621a080811f2c09989a792d8a /node-repository | |
| parent | 4640ec56fb19d738db17e99a62756decac941584 (diff) | |
Update node-repository tests
Diffstat (limited to 'node-repository')
2 files changed, 7 insertions, 7 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java index 86507508e68..5dfd1193581 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java @@ -226,7 +226,7 @@ public class CapacityCheckerTester { return m; } public String toString() { - return String.format("%s/%s/%s/%d%s", clustertype, clusterid, group, index, retired ? "/retired" : ""); + return String.format("%s/%s/%s/%d%s%s", clustertype, clusterid, group, index, retired ? "/retired" : "", clustertype.isContent() ? "/stateful" : ""); } } static class OwnerModel { 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 8b9d60aeaf4..e5333ea4186 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 @@ -79,7 +79,7 @@ public class NodeSerializerTest { node = node.allocate(ApplicationId.from(TenantName.from("myTenant"), ApplicationName.from("myApplication"), InstanceName.from("myInstance")), - ClusterMembership.from("content/myId/0/0", Vtag.currentVersion, Optional.empty()), + ClusterMembership.from("content/myId/0/0/stateful", Vtag.currentVersion, Optional.empty()), requestedResources, clock.instant()); assertEquals(1, node.history().events().size()); @@ -134,7 +134,7 @@ public class NodeSerializerTest { " \"applicationId\" : \"myApplication\",\n" + " \"tenantId\" : \"myTenant\",\n" + " \"instanceId\" : \"myInstance\",\n" + - " \"serviceId\" : \"content/myId/0/0\",\n" + + " \"serviceId\" : \"content/myId/0/0/stateful\",\n" + " \"restartGeneration\" : 3,\n" + " \"currentRestartGeneration\" : 4,\n" + " \"removable\" : true,\n" + @@ -167,7 +167,7 @@ public class NodeSerializerTest { node = node.allocate(ApplicationId.from(TenantName.from("myTenant"), ApplicationName.from("myApplication"), InstanceName.from("myInstance")), - ClusterMembership.from("content/myId/0/0", Vtag.currentVersion, Optional.empty()), + ClusterMembership.from("content/myId/0/0/stateful", Vtag.currentVersion, Optional.empty()), node.flavor().resources(), clock.instant()); assertEquals(1, node.history().events().size()); @@ -217,7 +217,7 @@ public class NodeSerializerTest { node = node.allocate(ApplicationId.from(TenantName.from("myTenant"), ApplicationName.from("myApplication"), InstanceName.from("myInstance")), - ClusterMembership.from("content/myId/0/0", Vtag.currentVersion, Optional.empty()), + ClusterMembership.from("content/myId/0/0/stateful", Vtag.currentVersion, Optional.empty()), node.flavor().resources(), clock.instant()); @@ -315,7 +315,7 @@ public class NodeSerializerTest { " \"hostname\" : \"myHostname\",\n" + " \"ipAddresses\" : [\"127.0.0.1\"],\n" + " \"instance\": {\n" + - " \"serviceId\": \"content/myId/0/0\",\n" + + " \"serviceId\": \"content/myId/0/0/stateful\",\n" + " \"wantedVespaVersion\": \"6.42.2\"\n" + " }\n" + "}"; @@ -408,7 +408,7 @@ public class NodeSerializerTest { node = node.allocate(ApplicationId.from(TenantName.from("myTenant"), ApplicationName.from("myApplication"), InstanceName.from("myInstance")), - ClusterMembership.from("content/myId/0/0", Vtag.currentVersion, Optional.empty()), + ClusterMembership.from("content/myId/0/0/stateful", Vtag.currentVersion, Optional.empty()), node.flavor().resources(), clock.instant()); assertTrue(node.allocation().isPresent()); |