diff options
4 files changed, 13 insertions, 21 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 bb7a79a3cbc..85808aa7775 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 @@ -29,7 +29,6 @@ import java.util.Set; */ public final class Node { - private final String id; private final Set<String> ipAddresses; private final IP.AddressPool ipAddressPool; private final String hostname; @@ -78,7 +77,6 @@ public final class Node { Objects.requireNonNull(history, "A null node history is not permitted"); Objects.requireNonNull(type, "A null node type is not permitted"); - this.id = hostname; this.ipAddresses = ImmutableSortedSet.copyOf(IP.naturalOrder, ipAddresses); this.ipAddressPool = new IP.AddressPool(this, ipAddressPool); this.hostname = hostname; @@ -92,12 +90,6 @@ public final class Node { this.type = type; } - /** - * Returns the unique id of this host. - * This may be the host name or some other opaque id which is unique across hosts - */ - public String id() { return id; } - /** Returns the IP addresses of this node */ public Set<String> ipAddresses() { return ipAddresses; } @@ -271,23 +263,24 @@ public final class Node { } @Override - public int hashCode() { - return id.hashCode(); + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Node node = (Node) o; + return hostname.equals(node.hostname); } @Override - public boolean equals(Object other) { - if (this == other) return true; - if ( ! other.getClass().equals(this.getClass())) return false; - return ((Node)other).id.equals(this.id); + public int hashCode() { + return Objects.hash(hostname); } @Override public String toString() { return state + " node " + - (hostname !=null ? hostname : id) + - (allocation.isPresent() ? " " + allocation.get() : "") + - (parentHostname.isPresent() ? " [on: " + parentHostname.get() + "]" : ""); + hostname + + (allocation.map(allocation1 -> " " + allocation1).orElse("")) + + (parentHostname.map(parent -> " [on: " + parent + "]").orElse("")); } public enum State { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java index 2a5673df1d2..5c0f0447cac 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java @@ -134,7 +134,7 @@ class NodesResponse extends HttpResponse { private void toSlime(Node node, boolean allFields, Cursor object) { object.setString("url", nodeParentUrl + node.hostname()); if ( ! allFields) return; - object.setString("id", node.id()); + object.setString("id", node.hostname()); object.setString("state", serializer.toString(node.state())); object.setString("type", node.type().name()); object.setString("hostname", node.hostname()); 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 b3f1fdb3fb2..2a311405499 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 @@ -49,7 +49,6 @@ public class SerializationTest { Node node = createNode(); Node copy = nodeSerializer.fromJson(Node.State.provisioned, nodeSerializer.toJson(node)); - assertEquals(node.id(), copy.id()); assertEquals(node.hostname(), copy.hostname()); assertEquals(node.openStackId(), copy.openStackId()); assertEquals(node.state(), copy.state()); @@ -78,7 +77,7 @@ public class SerializationTest { node = node.with(NodeType.tenant); Node copy = nodeSerializer.fromJson(Node.State.provisioned, nodeSerializer.toJson(node)); - assertEquals(node.id(), copy.id()); + assertEquals(node.openStackId(), copy.openStackId()); assertEquals(node.hostname(), copy.hostname()); assertEquals(node.state(), copy.state()); assertEquals(1, copy.allocation().get().restartGeneration().wanted()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java index c9edd13dbab..37327d45845 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java @@ -48,7 +48,7 @@ public class AclProvisioningTest { // Populate repo tester.makeReadyNodes(10, "default"); List<Node> dockerHost = tester.makeReadyNodes(1, "default", NodeType.host); - tester.makeReadyDockerNodes(1, "default", dockerHost.get(0).id()); + tester.makeReadyDockerNodes(1, "default", dockerHost.get(0).hostname()); List<Node> proxyNodes = tester.makeReadyNodes(3, "default", NodeType.proxy); // Allocate 2 nodes |