diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-02-04 13:29:10 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2019-02-04 13:29:53 +0100 |
| commit | 4b7e9b78488b149161fd2ee2512a64fffc03b050 (patch) | |
| tree | eda73b80f3ff23573064ad1c2d087db0b23524c0 /node-repository | |
| parent | 00605f087c3bdb8f6f6f67937500a4cbb9d201b5 (diff) | |
Add rotations field to load balancer API
Diffstat (limited to 'node-repository')
3 files changed, 14 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/LoadBalancersResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/LoadBalancersResponse.java index 045ebcb4e55..0dfe6b3c275 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/LoadBalancersResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/LoadBalancersResponse.java @@ -76,6 +76,12 @@ public class LoadBalancersResponse extends HttpResponse { realObject.setLong("port", real.port()); }); + Cursor rotationArray = lbObject.setArray("rotations"); + lb.rotations().forEach(rotation -> { + Cursor rotationObject = rotationArray.addObject(); + rotationObject.setString("name", rotation.value()); + }); + lbObject.setBool("inactive", lb.inactive()); }); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java index 679b716d611..68f675279b8 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java @@ -12,6 +12,7 @@ import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeType; +import com.yahoo.config.provision.RotationName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; import com.yahoo.transaction.NestedTransaction; @@ -116,7 +117,8 @@ public class MockNodeRepository extends NodeRepository { ClusterSpec zoneCluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("node-admin"), Version.fromString("6.42"), - false, Collections.emptySet()); + false, + Set.of(RotationName.from("us-cluster"))); activate(provisioner.prepare(zoneApp, zoneCluster, Capacity.fromRequiredNodeType(NodeType.host), 1, null), zoneApp, provisioner); ApplicationId app1 = ApplicationId.from(TenantName.from("tenant1"), ApplicationName.from("application1"), InstanceName.from("instance1")); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json index 6f24d8c46bb..e3baa069907 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json @@ -42,6 +42,11 @@ "port": 4080 } ], + "rotations": [ + { + "name": "us-cluster" + } + ], "inactive": false } ] |