diff options
author | valerijf <valerijf@oath.com> | 2017-08-24 16:16:36 +0200 |
---|---|---|
committer | valerijf <valerijf@oath.com> | 2017-08-24 16:16:36 +0200 |
commit | 9545446a4cbfcb788722ebe0fd9b485fa391a86b (patch) | |
tree | ba2d211fdeafb779a9a6544b2236c0b9f6c01b9f | |
parent | 11a32ac855669152476fc04145f1371ebf4a7701 (diff) |
Add provisioned event to history
3 files changed, 9 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java index c8f64a65415..8f7317b28eb 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java @@ -112,7 +112,7 @@ public class History { public enum Type { // State move events - readied, reserved, activated, deactivated, deallocated, parked, + provisioned(false), readied, reserved, activated, deactivated, deallocated, parked, // The active node was retired retired, // The active node went down according to the service monitor 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 8056bd787db..9393dc5ead4 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 @@ -257,6 +257,7 @@ public class NodeSerializer { /** Returns the event type, or null if this event type should be ignored */ private History.Event.Type eventTypeFromString(String eventTypeString) { switch (eventTypeString) { + case "provisioned" : return History.Event.Type.provisioned; case "readied" : return History.Event.Type.readied; case "reserved" : return History.Event.Type.reserved; case "activated" : return History.Event.Type.activated; @@ -273,6 +274,7 @@ public class NodeSerializer { } private String toString(History.Event.Type nodeEventType) { switch (nodeEventType) { + case provisioned : return "provisioned"; case readied : return "readied"; case reserved : return "reserved"; case activated : return "activated"; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java index 1b19b57317e..f91b4863eeb 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java @@ -117,6 +117,10 @@ public class SerializationTest { " \"flavor\" : \"large\",\n" + " \"history\" : [\n" + " {\n" + + " \"type\" : \"provisioned\",\n" + + " \"at\" : 1444391401389\n" + + " },\n" + + " {\n" + " \"type\" : \"reserved\",\n" + " \"at\" : 1444391402611\n" + " }\n" + @@ -143,6 +147,8 @@ public class SerializationTest { assertEquals(2, node.status().reboot().current()); assertEquals(3, node.allocation().get().restartGeneration().wanted()); assertEquals(4, node.allocation().get().restartGeneration().current()); + assertEquals(Arrays.asList(History.Event.Type.provisioned, History.Event.Type.reserved), + node.history().events().stream().map(History.Event::type).collect(Collectors.toList())); assertTrue(node.allocation().get().isRemovable()); assertEquals(NodeType.tenant, node.type()); } |