diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-12-07 17:04:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 17:04:03 +0100 |
| commit | 99198a68e6359b5fe167f6cbbc6bca277909be8f (patch) | |
| tree | 3c033bacebe2b7d0a7bfc0d9cdd5a899f60fe893 /node-repository | |
| parent | d660106248ad0450f8442cc03bd814f365cacdff (diff) | |
| parent | 6c85b7d5e46b9e7696f28396c2c6d7e85fb81d75 (diff) | |
Merge pull request #25155 from vespa-engine/hakonhall/bind-node-added-via-rest-api-with-vespa-cloud-account
Bind node added via REST API with Vespa cloud account
Diffstat (limited to 'node-repository')
6 files changed, 12 insertions, 6 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java index 6e80e559b20..83372f25d6e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java @@ -291,7 +291,8 @@ public class NodesV2ApiHandler extends ThreadedHttpRequestHandler { IP.Config.of(ipAddresses, ipAddressPool, addressPool), inspector.field("hostname").asString(), flavorFromSlime(inspector), - nodeTypeFromSlime(inspector.field("type"))); + nodeTypeFromSlime(inspector.field("type"))) + .cloudAccount(nodeRepository.zone().cloud().account()); optionalString(inspector.field("parentHostname")).ifPresent(builder::parentHostname); optionalString(inspector.field("modelName")).ifPresent(builder::modelName); optionalString(inspector.field("reservedTo")).map(TenantName::from).ifPresent(builder::reservedTo); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json index 11f183a13d0..42ca28a09d5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json @@ -34,5 +34,6 @@ "ipAddresses": [ "127.0.0.1" ], - "additionalIpAddresses": [] + "additionalIpAddresses": [], + "cloudAccount":"111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json index c7d7d17b0f4..72131465f29 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json @@ -35,5 +35,6 @@ "::11" ], "additionalIpAddresses": [ - ] + ], + "cloudAccount":"111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json index 3c70371cdc6..bbef88ca1b0 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json @@ -49,5 +49,6 @@ } ], "ipAddresses": ["127.0.8.1"], - "additionalIpAddresses": ["127.0.8.2"] + "additionalIpAddresses": ["127.0.8.2"], + "cloudAccount":"111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json index 2cb3213add1..e9199905b21 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json @@ -37,5 +37,6 @@ "::9:1" ], "additionalIpAddresses": [], - "additionalHostnames": ["node9-1.yahoo.com"] + "additionalHostnames": ["node9-1.yahoo.com"], + "cloudAccount":"111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json index 03227335019..cfcc59a3454 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json @@ -38,5 +38,6 @@ "127.0.127.1", "::127:1" ], - "additionalIpAddresses": [] + "additionalIpAddresses": [], + "cloudAccount":"111222333444" } |