Remove old format for adding node

2 files changed, 7 insertions, 56 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 c291e23cefe..692402ea914 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
@@ -49,10 +49,6 @@ import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-import static com.yahoo.config.provision.NodeResources.DiskSpeed.fast;
-import static com.yahoo.config.provision.NodeResources.DiskSpeed.slow;
-import static com.yahoo.config.provision.NodeResources.StorageType.local;
-import static com.yahoo.config.provision.NodeResources.StorageType.remote;
 import static com.yahoo.vespa.config.SlimeUtils.optionalString;
 
 /**
@@ -243,22 +239,13 @@ public class NodesApiHandler extends LoggingRequestHandler {
         Inspector flavorInspector = inspector.field("flavor");
         Inspector resourcesInspector = inspector.field("resources");
         if ( ! flavorInspector.valid()) {
-            return new Flavor(resourcesInspector.valid() ?
-                    new NodeResources(
-                            requiredField(resourcesInspector, "vcpu", Inspector::asDouble),
-                            requiredField(resourcesInspector, "memoryGb", Inspector::asDouble),
-                            requiredField(resourcesInspector, "diskGb", Inspector::asDouble),
-                            requiredField(resourcesInspector, "bandwidthGbps", Inspector::asDouble),
-                            optionalString(resourcesInspector.field("diskSpeed")).map(serializer::diskSpeedFrom).orElse(NodeResources.DiskSpeed.getDefault()),
-                            optionalString(resourcesInspector.field("storageType")).map(serializer::storageTypeFrom).orElse(NodeResources.StorageType.getDefault())) :
-                    // TODO: Remove when all clients have migrated to the above format
-                    new NodeResources(
-                            requiredField(inspector, "minCpuCores", Inspector::asDouble),
-                            requiredField(inspector, "minMainMemoryAvailableGb", Inspector::asDouble),
-                            requiredField(inspector, "minDiskAvailableGb", Inspector::asDouble),
-                            requiredField(inspector, "bandwidthGbps", Inspector::asDouble),
-                            requiredField(inspector, "fastDisk", Inspector::asBool) ? fast : slow,
-                            requiredField(inspector, "remoteStorage", Inspector::asBool) ? remote : local));
+            return new Flavor(new NodeResources(
+                    requiredField(resourcesInspector, "vcpu", Inspector::asDouble),
+                    requiredField(resourcesInspector, "memoryGb", Inspector::asDouble),
+                    requiredField(resourcesInspector, "diskGb", Inspector::asDouble),
+                    requiredField(resourcesInspector, "bandwidthGbps", Inspector::asDouble),
+                    optionalString(resourcesInspector.field("diskSpeed")).map(serializer::diskSpeedFrom).orElse(NodeResources.DiskSpeed.getDefault()),
+                    optionalString(resourcesInspector.field("storageType")).map(serializer::storageTypeFrom).orElse(NodeResources.StorageType.getDefault())));
         }
 
         Flavor flavor = nodeFlavors.getFlavorOrThrow(flavorInspector.asString());
@@ -275,20 +262,6 @@ public class NodesApiHandler extends LoggingRequestHandler {
                 flavor = flavor.with(flavor.resources().with(serializer.diskSpeedFrom(resourcesInspector.field("diskSpeed").asString())));
             if (resourcesInspector.field("storageType").valid())
                 flavor = flavor.with(flavor.resources().with(serializer.storageTypeFrom(resourcesInspector.field("storageType").asString())));
-        } else {
-            // TODO: Remove when all clients have migrated to the above format
-            if (inspector.field("minCpuCores").valid())
-                flavor = flavor.with(flavor.resources().withVcpu(inspector.field("minCpuCores").asDouble()));
-            if (inspector.field("minMainMemoryAvailableGb").valid())
-                flavor = flavor.with(flavor.resources().withMemoryGb(inspector.field("minMainMemoryAvailableGb").asDouble()));
-            if (inspector.field("minDiskAvailableGb").valid())
-                flavor = flavor.with(flavor.resources().withDiskGb(inspector.field("minDiskAvailableGb").asDouble()));
-            if (inspector.field("bandwidthGbps").valid())
-                flavor = flavor.with(flavor.resources().withBandwidthGbps(inspector.field("bandwidthGbps").asDouble()));
-            if (inspector.field("fastDisk").valid())
-                flavor = flavor.with(flavor.resources().with(inspector.field("fastDisk").asBool() ? fast : slow));
-            if (inspector.field("remoteStorage").valid())
-                flavor = flavor.with(flavor.resources().with(inspector.field("remoteStorage").asBool() ? remote : local));
         }
         return flavor;
     }
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 d66cffa3a0c..18f0d989900 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
@@ -828,28 +828,6 @@ public class RestApiTest {
     }
 
     @Test
-    public void test_flavor_overrides_old_format() throws Exception {
-        String hostname = "parent2.yahoo.com";
-        // Test adding with overrides
-        assertResponse(new Request("http://localhost:8080/nodes/v2/node",
-                ("[{\"hostname\":\"" + hostname + "\"," + createIpAddresses("::1") + "\"openStackId\":\"osid-123\"," +
-                        "\"flavor\":\"large-variant\",\"minDiskAvailableGb\":1234,\"minMainMemoryAvailableGb\":4321}]").
-                        getBytes(StandardCharsets.UTF_8),
-                Request.Method.POST),
-                400,
-                "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Can only override disk GB for configured flavor\"}");
-
-        assertResponse(new Request("http://localhost:8080/nodes/v2/node",
-                        ("[{\"hostname\":\"" + hostname + "\"," + createIpAddresses("::1") + "\"openStackId\":\"osid-123\"," +
-                                "\"flavor\":\"large-variant\",\"type\":\"host\",\"minDiskAvailableGb\":1234}]").
-                                getBytes(StandardCharsets.UTF_8),
-                        Request.Method.POST),
-                "{\"message\":\"Added 1 nodes to the provisioned state\"}");
-        assertResponseContains(new Request("http://localhost:8080/nodes/v2/node/" + hostname),
-                "\"resources\":{\"vcpu\":64.0,\"memoryGb\":128.0,\"diskGb\":1234.0,\"bandwidthGbps\":15.0,\"diskSpeed\":\"fast\",\"storageType\":\"remote\"}");
-    }
-
-    @Test
     public void test_flavor_overrides() throws Exception {
         String host = "parent2.yahoo.com";
         // Test adding with overrides