diff options
| author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-01-06 23:51:01 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-01-06 23:51:01 +0100 |
| commit | f3a02ac4bf9482572cc764ddeb6e23cf1247daa3 (patch) | |
| tree | 674bcdd70e5e57ef13021061b50719a3b66d6aa3 /node-repository | |
| parent | eb85f48b3a6e4e69b2d45f2d9393d8b4d8e27daa (diff) | |
Use UUID for Linux container nodes
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java | 5 | ||||
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json | 2 |
2 files changed, 4 insertions, 3 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 4d63863a917..3db68a27234 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 @@ -27,6 +27,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -63,7 +64,7 @@ public final class Node implements Nodelike { /** Creates a node builder in the initial state (reserved) */ public static Node.Builder reserve(Set<String> ipAddresses, String hostname, String parentHostname, NodeResources resources, NodeType type) { - return new Node.Builder("fake-" + hostname, hostname, new Flavor(resources), State.reserved, type) + return new Node.Builder(UUID.randomUUID().toString(), hostname, new Flavor(resources), State.reserved, type) .ipConfig(IP.Config.ofEmptyPool(ipAddresses)) .parentHostname(parentHostname); } @@ -140,7 +141,7 @@ public final class Node implements Nodelike { * * - OpenStack: UUID * - AWS: Instance ID - * - Linux containers: fake-[hostname] + * - Linux containers: UUID */ public String id() { return id; } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json index c9784c7e610..b5efc69d6db 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json @@ -1,6 +1,6 @@ { "url": "http://localhost:8080/nodes/v2/node/test-node-pool-102-2", - "id": "fake-test-node-pool-102-2", + "id": "(ignore)", "state": "active", "type": "tenant", "hostname": "test-node-pool-102-2", |