Remove unused fields in ACL response

2 files changed, 8 insertions, 15 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeAclResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeAclResponse.java
index b095025de3d..18fe2212dd2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeAclResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeAclResponse.java
@@ -40,14 +40,7 @@ public class NodeAclResponse extends HttpResponse {
         Node node = nodeRepository.getNode(hostname)
                 .orElseThrow(() -> new IllegalArgumentException("No node with hostname '" + hostname + "'"));
 
-        if ( ! node.ipAddress().isPresent()) return; // empty response
-        toSlime(node, nodeRepository.getTrustedNodes(node), object);
-    }
-
-    private void toSlime(Node node, List<Node> trustedNodes, Cursor object) {
-        object.setString("hostname", node.hostname());
-        object.setString("ipAddress", node.ipAddress().get());
-        toSlime(trustedNodes, object.setArray("trustedNodes"));
+        toSlime(nodeRepository.getTrustedNodes(node), object.setArray("trustedNodes"));
     }
 
     private void toSlime(List<Node> trustedNodes, Cursor array) {
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 924a87f70d0..816d744b190 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
@@ -221,8 +221,7 @@ public class RestApiTest {
         assertResponse(new Request("http://localhost:8080/nodes/v2/state/ready/" + hostname,
                                    new byte[0], Request.Method.PUT),
                        "{\"message\":\"Moved foo.yahoo.com to ready\"}");
-        Pattern responsePattern = Pattern.compile("\\{\"hostname\":\"foo.yahoo.com\",\"ipAddress\":\".+?\"," +
-                "\"trustedNodes\":\\[" +
+        Pattern responsePattern = Pattern.compile("\\{\"trustedNodes\":\\[" +
                 "\\{\"hostname\":\"cfg1\",\"ipAddress\":\".+?\"}," +
                 "\\{\"hostname\":\"cfg2\",\"ipAddress\":\".+?\"}," +
                 "\\{\"hostname\":\"cfg3\",\"ipAddress\":\".+?\"}" +
@@ -359,14 +358,15 @@ public class RestApiTest {
     }
 
     private void assertResponseContains(Request request, String responseSnippet) throws IOException {
-        assertTrue("Response contains " + responseSnippet,
-                   container.handleRequest(request).getBodyAsString().contains(responseSnippet));
+        String response = container.handleRequest(request).getBodyAsString();
+        assertTrue(String.format("Expected response to contain: %s\nResponse: %s", responseSnippet, response),
+                response.contains(responseSnippet));
     }
 
     private void assertResponseMatches(Request request, Pattern pattern) throws IOException {
-        // System.out.println(container.handleRequest(request).getBodyAsString());
-        assertTrue("Response matches " + pattern.toString(),
-                   pattern.matcher(container.handleRequest(request).getBodyAsString()).matches());
+        String response = container.handleRequest(request).getBodyAsString();
+        assertTrue(String.format("Expected response to match pattern: %s\nResponse: %s", pattern.toString(), response),
+                   pattern.matcher(response).matches());
     }
 
     private void assertFile(Request request, String responseFile) throws IOException {