Merge pull request #1961 from yahoo/musum/stop-supporting-ipAddress-when-creating-node

Stop supporting creation of node with ipAddress

2 files changed, 5 insertions, 21 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
index f45512c3c6f..c9c91d59641 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
@@ -194,9 +194,7 @@ public class NodesApiHandler extends LoggingRequestHandler {
 
     private Node createNode(Inspector inspector) {
         Optional<String> parentHostname = optionalString(inspector.field("parentHostname"));
-        Optional<String> ipAddress = optionalString(inspector.field("ipAddress"));
         Set<String> ipAddresses = new HashSet<>();
-        ipAddress.ifPresent(ipAddresses::add);
         inspector.field("ipAddresses").traverse((ArrayTraverser) (i, item) -> ipAddresses.add(item.asString()));
 
         return nodeRepository.createNode(
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 afe07adb645..1ef453eaecf 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
@@ -442,28 +442,14 @@ public class RestApiTest {
                 ", \"type\":\"host\"}";
     }
 
-    // TODO: Simplify when ipAddress is not used anymore (see NodesApiHandler.createNode())
     private String createIpAddresses(String... ipAddress) {
-        final String ipAddressJsonPart;
-        switch (ipAddress.length) {
-            case 0:
-                ipAddressJsonPart = "";
-                break;
-            case 1:
-                // Old format
-                ipAddressJsonPart = "\"ipAddress\":\"" + ipAddress[0] + "\",";
-                break;
-            default:
-                ipAddressJsonPart = "\"ipAddresses\":[" +
-                        Arrays.stream(ipAddress)
-                              .map(ip -> "\"" + ip + "\"")
-                              .collect(Collectors.joining(",")) +
-                        "],";
-        }
-        return ipAddressJsonPart;
+        return "\"ipAddresses\":[" +
+                Arrays.stream(ipAddress)
+                      .map(ip -> "\"" + ip + "\"")
+                      .collect(Collectors.joining(",")) +
+                "],";
     }
 
-
     /** Asserts a particular response and 200 as response status */
     private void assertResponse(Request request, String responseMessage) throws IOException {
         assertResponse(request, 200, responseMessage);