diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-02-04 13:20:13 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2019-02-04 13:29:42 +0100 |
| commit | 00605f087c3bdb8f6f6f67937500a4cbb9d201b5 (patch) | |
| tree | d96605fd2efa3469260cbb7c6de020786b18f315 /node-repository | |
| parent | c881bc08dc1d216ee676bf9b215c40b219f7c5bb (diff) | |
Add networks field to load balancer API
Diffstat (limited to 'node-repository')
3 files changed, 8 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 f8afbe0a31e..045ebcb4e55 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 @@ -62,6 +62,9 @@ public class LoadBalancersResponse extends HttpResponse { lbObject.setString("hostname", lb.hostname().value()); lb.dnsZone().ifPresent(dnsZone -> lbObject.setString("dnsZone", dnsZone.id())); + Cursor networkArray = lbObject.setArray("networks"); + lb.networks().forEach(networkArray::addString); + Cursor portArray = lbObject.setArray("ports"); lb.ports().forEach(portArray::addLong); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java index 14396e3d70f..177a455cbc5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** - * Test of the nodes/v2 API. + * Test of the REST APIs provided by the node repository. * * Note: This class is referenced from our operations documentation and must not be renamed/moved without updating that. * 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 213e12e13bf..6f24d8c46bb 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 @@ -8,6 +8,10 @@ "cluster": "node-admin", "hostname": "lb-zoneapp.zoneapp.zoneapp-node-admin", "dnsZone": "zone-id-1", + "networks": [ + "10.2.3.0/24", + "10.4.5.0/24" + ], "ports": [ 4443 ], |