diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-03-08 11:05:06 +0100 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2017-03-08 11:05:06 +0100 |
commit | 23a679c24c322513bbc78f8004112dd49cfec308 (patch) | |
tree | e1ae1c2be961a554321cdf2a236e2dee2f09c125 | |
parent | 1ac6a2567a36c904bd03750585759f530bb0b58c (diff) |
Use local ip addresses and simplify loop
17 files changed, 19 insertions, 21 deletions
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 ceff9569bac..e69288c01e5 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 @@ -209,9 +209,7 @@ class NodesResponse extends HttpResponse { } private void ipAddressesToSlime(Set<String> ipAddresses, Cursor array) { - for (String ip : ipAddresses) { - array.addString(ip); - } + ipAddresses.forEach(array::addString); } private String lastElement(String path) { 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 540fb5bc890..e41956c0274 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 @@ -60,7 +60,7 @@ public class MockNodeRepository extends NodeRepository { List<Node> nodes = new ArrayList<>(); - final List<String> ipAddressesForAllHost = Arrays.asList("127.0.0.1", "2001:4998:c:2974::1029"); + final List<String> ipAddressesForAllHost = Arrays.asList("127.0.0.1", "::1"); Collections.sort(ipAddressesForAllHost); final HashSet<String> ipAddresses = new HashSet<>(ipAddressesForAllHost); 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 a3b9a14804f..afe07adb645 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 @@ -71,9 +71,9 @@ public class RestApiTest { // POST new nodes assertResponse(new Request("http://localhost:8080/nodes/v2/node", ("[" + asNodeJson("host8.yahoo.com", "default", "127.0.0.1") + "," + // test with only 1 ip address - asNodeJson("host9.yahoo.com", "large-variant", "127.0.0.1", "2001:4998:c:2974::1029") + "," + - asHostJson("parent2.yahoo.com", "large-variant", "127.0.0.1", "2001:4998:c:2974::1029") + "," + - asDockerNodeJson("host11.yahoo.com", "parent.host.yahoo.com", "127.0.0.1", "2001:4998:c:2974::1029") + "]"). + asNodeJson("host9.yahoo.com", "large-variant", "127.0.0.1", "::1") + "," + + asHostJson("parent2.yahoo.com", "large-variant", "127.0.0.1", "::1") + "," + + asDockerNodeJson("host11.yahoo.com", "parent.host.yahoo.com", "127.0.0.1", "::1") + "]"). getBytes(StandardCharsets.UTF_8), Request.Method.POST), "{\"message\":\"Added 4 nodes to the provisioned state\"}"); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json index bb209bdaf44..42b1288df79 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json @@ -32,5 +32,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[{"event":"readied","at":123},{"event":"reserved","at":123},{"event":"activated","at":123}], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json index 1edb26d95bb..dfa2dd92211 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json @@ -37,5 +37,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[{"event":"readied","at":123},{"event":"reserved","at":123}], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json index b138077b5b6..7a19b0fd80d 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json @@ -19,5 +19,5 @@ "hardwareFailure":false, "wantToRetire":false, "history":[], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json index d6fbc56eefc..583432a40d9 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json @@ -32,5 +32,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[{"event":"readied","at":123},{"event":"reserved","at":123},{"event":"activated","at":123}], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json index 05242d71e0a..c4966a13d06 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json @@ -30,5 +30,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[{"event":"readied","at":123},{"event":"reserved","at":123},{"event":"activated","at":123}], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json index f0b5fef6222..23188ccbbcc 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json @@ -35,5 +35,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[{"event":"readied","at":123},{"event":"reserved","at":123}], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json index a2eccfdfee3..cb664df2aa4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json @@ -19,5 +19,5 @@ "hardwareFailure": false, "wantToRetire": false, "history":[{"event":"readied","at":123},{"event":"failed","at":123}], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json index 2560c38c15d..9d0871a1be0 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json @@ -21,5 +21,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[{"event":"readied","at":123},{"event":"failed","at":123}], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json index a2b6f904054..4e40bcb3217 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json @@ -18,5 +18,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[{"event":"deallocated","at":123}], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json index 04e0dfbb4a4..44cc9f87b0e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json @@ -32,5 +32,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[{"event":"readied","at":123},{"event":"reserved","at":123},{"event":"activated","at":123}], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json index 6b8abb72f0c..bad845168d5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json @@ -18,5 +18,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json index d9837a64444..e27f7539a11 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json @@ -18,5 +18,5 @@ "hardwareFailure" : false, "wantToRetire" : false, "history":[], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json index 294086be12d..a7fb7bb870a 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json @@ -23,5 +23,5 @@ "at": 123 } ], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json index 1210f5d7165..5c2101b75a1 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json @@ -18,5 +18,5 @@ "hardwareFailure": false, "wantToRetire" : false, "history": [], - "ipAddresses":["2001:4998:c:2974::1029", "127.0.0.1"] + "ipAddresses":["::1", "127.0.0.1"] } |