summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2016-09-19 09:59:23 +0200
committerHarald Musum <musum@yahoo-inc.com>2016-09-19 09:59:23 +0200
commit2af66af8a27556e65dac94360be6111a8fe964b9 (patch)
tree7581ea7e2d423f3e745b3d37801a0721acdfeffa /node-repository
parent371cfd624c995ca8bb6e3b8a2983e79dd4b49b72 (diff)
Use Node.State from node repo instead of duplicating value in our own class
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java8
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v1/NodesApiHandler.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
index 0f3a87ff585..660ca500339 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
@@ -93,7 +93,7 @@ public final class Node {
/** Returns the flavor of this node */
public Flavor flavor() { return flavor; }
- /** Returns the known information about the nodes ephemeral status */
+ /** Returns the known information about the node's ephemeral status */
public Status status() { return status; }
/** Returns the current state of this node (in the node state machine) */
@@ -130,7 +130,7 @@ public final class Node {
return with(allocation.get().unretire());
}
- /** Returns a copy of this with the current generation set to generation */
+ /** Returns a copy of this with the current restart generation set to generation */
public Node withRestart(Generation generation) {
final Optional<Allocation> allocation = this.allocation;
if ( ! allocation.isPresent())
@@ -154,7 +154,7 @@ public final class Node {
return new Node(openStackId, hostname, parentHostname, flavor, status, state, allocation, history, type);
}
- /** Returns a copy of this with the current generation set to generation */
+ /** Returns a copy of this with the current reboot generation set to generation */
public Node withReboot(Generation generation) {
return new Node(openStackId, hostname, parentHostname, flavor, status.withReboot(generation), state,
allocation, history, type);
@@ -217,7 +217,7 @@ public final class Node {
public enum State {
- /** This node has been requested (from OpenStack) but is not yet read for use */
+ /** This node has been requested (from OpenStack) but is not yet ready for use */
provisioned,
/** This node is free and ready for use */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v1/NodesApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v1/NodesApiHandler.java
index da70453c293..b5cf89004b9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v1/NodesApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v1/NodesApiHandler.java
@@ -22,7 +22,7 @@ import java.util.Optional;
import java.util.concurrent.Executor;
/**
- * The implementation of the /state/v1 API.
+ * The implementation of the /nodes/v1 API.
* This dumps the content of the node repository on request, possibly with a host filter to return just the single
* matching node.
*
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
index 9e240ba6055..4a346f5b1bb 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
@@ -34,7 +34,7 @@ import java.util.logging.Level;
import static com.yahoo.vespa.config.SlimeUtils.optionalString;
/**
- * The implementation of the /state/v2 API.
+ * The implementation of the /nodes/v2 API.
* See RestApiTest for documentation.
*
* @author bratseth