Remove support for legacy flavor strings

4 files changed, 52 insertions, 257 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java
index 2e17c2d6f67..4ec2bac0159 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java
@@ -49,6 +49,9 @@ public class NodeList implements Iterable<Node> {
     /** Returns the subset of nodes having exactly the given resources */
     public NodeList resources(NodeResources resources) { return filter(node -> node.flavor().resources().equals(resources)); }
 
+    /** Returns the subset of nodes not having exactly the given resources */
+    public NodeList notResources(NodeResources resources) { return filter(node ->  ! node.flavor().resources().equals(resources)); }
+
     /** Returns the subset of nodes of the given flavor */
     public NodeList flavor(String flavor) {
         return filter(node -> node.flavor().name().equals(flavor));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java
index 1f474a8e07e..d543856f71c 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java
@@ -285,22 +285,6 @@ public class DynamicDockerAllocationTest {
     }
 
     @Test
-    public void legacy_bare_metal_allocations_are_not_altered() {
-        ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(SystemName.cd, Environment.prod, RegionName.from("us-east"))).flavorsConfig(flavorsConfig()).build();
-        tester.makeReadyNodes(5, "host-large", NodeType.tenant);
-        deployZoneApp(tester);
-
-        ApplicationId application = tester.makeApplicationId();
-        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Version.fromString("1"), false);
-        NodeResources resources = NodeResources.fromLegacyName("host-large");
-
-        List<HostSpec> hosts = tester.prepare(application, cluster, 2, 1, resources);
-        assertEquals(2, hosts.size());
-        assertEquals("host-large", hosts.get(0).flavor().get().name());
-        tester.activate(application, hosts);
-    }
-
-    @Test
     public void provisioning_fast_disk_speed_do_not_get_slow_nodes() {
         provisionFastAndSlowThenDeploy(NodeResources.DiskSpeed.fast, true);
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java
index a5d5fb81147..0523a1f7f72 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java
@@ -7,6 +7,7 @@ import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostSpec;
+import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.hosted.provision.Node;
@@ -38,25 +39,25 @@ public class MultigroupProvisioningTest {
 
         ApplicationId application1 = tester.makeApplicationId();
 
-        tester.makeReadyNodes(21, "default");
-
-        deploy(application1, 6, 1, tester);
-        deploy(application1, 6, 2, tester);
-        deploy(application1, 6, 3, tester);
-        deploy(application1, 6, 6, tester);
-        deploy(application1, 6, 1, tester);
-        deploy(application1, 6, 6, tester);
-        deploy(application1, 6, 6, tester);
-        deploy(application1, 6, 2, tester);
-        deploy(application1, 8, 2, tester);
-        deploy(application1, 9, 3, tester);
-        deploy(application1, 9, 3, tester);
-        deploy(application1, 9, 3, tester);
-        deploy(application1,12, 4, tester);
-        deploy(application1, 8, 4, tester);
-        deploy(application1,12, 4, tester);
-        deploy(application1, 8, 2, tester);
-        deploy(application1, 6, 3, tester);
+        tester.makeReadyNodes(21, "d-1-3-9");
+
+        deploy(application1, 6, 1, "d-1-3-9", tester);
+        deploy(application1, 6, 2, "d-1-3-9", tester);
+        deploy(application1, 6, 3, "d-1-3-9", tester);
+        deploy(application1, 6, 6, "d-1-3-9", tester);
+        deploy(application1, 6, 1, "d-1-3-9", tester);
+        deploy(application1, 6, 6, "d-1-3-9", tester);
+        deploy(application1, 6, 6, "d-1-3-9", tester);
+        deploy(application1, 6, 2, "d-1-3-9", tester);
+        deploy(application1, 8, 2, "d-1-3-9", tester);
+        deploy(application1, 9, 3, "d-1-3-9", tester);
+        deploy(application1, 9, 3, "d-1-3-9", tester);
+        deploy(application1, 9, 3, "d-1-3-9", tester);
+        deploy(application1,12, 4, "d-1-3-9", tester);
+        deploy(application1, 8, 4, "d-1-3-9", tester);
+        deploy(application1,12, 4, "d-1-3-9", tester);
+        deploy(application1, 8, 2, "d-1-3-9", tester);
+        deploy(application1, 6, 3, "d-1-3-9", tester);
     }
 
     /**
@@ -70,7 +71,7 @@ public class MultigroupProvisioningTest {
 
         ApplicationId application1 = tester.makeApplicationId();
 
-        tester.makeReadyNodes(21, "default");
+        tester.makeReadyNodes(21, "d-1-3-9");
 
         deploy(application1, 12, 2, tester);
         deploy(application1, 9, 3, tester);
@@ -83,12 +84,12 @@ public class MultigroupProvisioningTest {
 
         ApplicationId application1 = tester.makeApplicationId();
 
-        tester.makeReadyNodes(10, "small");
-        tester.makeReadyNodes(10, "large");
+        tester.makeReadyNodes(10, "d-1-1-1");
+        tester.makeReadyNodes(10, "d-3-3-3");
 
-        deploy(application1, 8, 1, "small", tester);
-        deploy(application1, 8, 1, "large", tester);
-        deploy(application1, 8, 8, "large", tester);
+        deploy(application1, 8, 1, "d-1-1-1", tester);
+        deploy(application1, 8, 1, "d-3-3-3", tester);
+        deploy(application1, 8, 8, "d-3-3-3", tester);
     }
 
     @Test
@@ -97,10 +98,10 @@ public class MultigroupProvisioningTest {
 
         ApplicationId application1 = tester.makeApplicationId();
 
-        tester.makeReadyNodes(10, "small");
+        tester.makeReadyNodes(10, "d-1-1-1");
 
-        deploy(application1, Capacity.fromNodeCount(1, Optional.of("small"), true, true), 1, tester);
-        deploy(application1, Capacity.fromNodeCount(2, Optional.of("small"), true, true), 2, tester);
+        deploy(application1, Capacity.fromNodeCount(1, Optional.of("d-1-1-1"), true, true), 1, tester);
+        deploy(application1, Capacity.fromNodeCount(2, Optional.of("d-1-1-1"), true, true), 2, tester);
     }
 
     @Test
@@ -109,11 +110,11 @@ public class MultigroupProvisioningTest {
 
         ApplicationId application1 = tester.makeApplicationId();
 
-        tester.makeReadyNodes(10, "small");
-        tester.makeReadyNodes(10, "large");
+        tester.makeReadyNodes(10, "d-1-1-1");
+        tester.makeReadyNodes(10, "d-3-3-3");
 
-        deploy(application1, Capacity.fromNodeCount(1, Optional.of("small"), true, true), 1, tester);
-        deploy(application1, Capacity.fromNodeCount(2, Optional.of("large"), true, true), 2, tester);
+        deploy(application1, Capacity.fromNodeCount(1, Optional.of("d-1-1-1"), true, true), 1, tester);
+        deploy(application1, Capacity.fromNodeCount(2, Optional.of("d-3-3-3"), true, true), 2, tester);
     }
 
     @Test
@@ -122,11 +123,11 @@ public class MultigroupProvisioningTest {
 
         ApplicationId application1 = tester.makeApplicationId();
 
-        tester.makeReadyNodes(10, "small");
-        tester.makeReadyNodes(10, "large");
+        tester.makeReadyNodes(10, "d-1-1-1");
+        tester.makeReadyNodes(10, "d-3-3-3");
 
-        deploy(application1, 8, 1, "small", tester);
-        deploy(application1, 8, 1, "large", tester);
+        deploy(application1, 8, 1, "d-1-1-1", tester);
+        deploy(application1, 8, 1, "d-3-3-3", tester);
 
         // Expire small nodes
         tester.advanceTime(Duration.ofDays(7));
@@ -135,35 +136,36 @@ public class MultigroupProvisioningTest {
                              tester.clock(),
                              Collections.singletonMap(application1, 
                                                       new MockDeployer.ApplicationContext(application1, cluster(), 
-                                                                                          Capacity.fromNodeCount(8, Optional.of("large"), false, true), 1)));
+                                                                                          Capacity.fromNodeCount(8, Optional.of("d-3-3-3"), false, true), 1)));
         new RetiredExpirer(tester.nodeRepository(), tester.orchestrator(), deployer, tester.clock(), Duration.ofDays(30),
                 Duration.ofHours(12)).run();
 
-        assertEquals(8, tester.getNodes(application1, Node.State.inactive).flavor("small").size());
-        deploy(application1, 8, 8, "large", tester);
+        assertEquals(8, tester.getNodes(application1, Node.State.inactive).resources(new NodeResources(1, 1, 1)).size());
+        deploy(application1, 8, 8, "d-3-3-3", tester);
     }
 
     private void deploy(ApplicationId application, int nodeCount, int groupCount, String flavor, ProvisioningTester tester) {
         deploy(application, Capacity.fromNodeCount(nodeCount, Optional.of(flavor), false, true), groupCount, tester);
     }
     private void deploy(ApplicationId application, int nodeCount, int groupCount, ProvisioningTester tester) {
-        deploy(application, Capacity.fromNodeCount(nodeCount, Optional.of("default"), false, true), groupCount, tester);
+        deploy(application, Capacity.fromNodeCount(nodeCount, Optional.of("d-3-3-3"), false, true), groupCount, tester);
     }
 
-    @SuppressWarnings("deprecation") // TODO: Remove
     private void deploy(ApplicationId application, Capacity capacity, int wantedGroups, ProvisioningTester tester) {
         int nodeCount = capacity.nodeCount();
-        String flavor = capacity.flavor().get();
+        NodeResources nodeResources = capacity.nodeResources().get();
 
-        int previousActiveNodeCount = tester.getNodes(application, Node.State.active).flavor(flavor).size();
+        int previousActiveNodeCount = tester.getNodes(application, Node.State.active).resources(nodeResources).size();
 
         tester.activate(application, prepare(application, capacity, wantedGroups, tester));
 
+        System.out.println("Active nodes ---------------");
+        tester.getNodes(application, Node.State.active).forEach(n -> System.out.println("  " + n.hostname() + ": Flavor : " + n.flavor() + " retired " + n.status().wantToRetire()));
         assertEquals("Superfluous nodes are retired, but no others - went from " + previousActiveNodeCount + " to " + nodeCount + " nodes",
                      Math.max(0, previousActiveNodeCount - capacity.nodeCount()),
-                     tester.getNodes(application, Node.State.active).retired().flavor(flavor).size());
+                     tester.getNodes(application, Node.State.active).retired().resources(nodeResources).size());
         assertEquals("Other flavors are retired",
-                     0, tester.getNodes(application, Node.State.active).nonretired().notFlavor(capacity.flavor().get()).size());
+                     0, tester.getNodes(application, Node.State.active).nonretired().notResources(nodeResources).size());
 
         // Check invariants for all nodes
         Set<Integer> allIndexes = new HashSet<>();
@@ -179,7 +181,7 @@ public class MultigroupProvisioningTest {
         // Count unretired nodes and groups of the requested flavor
         Set<Integer> indexes = new HashSet<>();
         Map<ClusterSpec.Group, Integer> nonretiredGroups = new HashMap<>();
-        for (Node node : tester.getNodes(application, Node.State.active).nonretired().flavor(flavor)) {
+        for (Node node : tester.getNodes(application, Node.State.active).nonretired().resources(nodeResources)) {
             indexes.add(node.allocation().get().membership().index());
 
             ClusterSpec.Group group = node.allocation().get().membership().cluster().group().get();
@@ -194,7 +196,7 @@ public class MultigroupProvisioningTest {
             assertEquals("Group size", (long)nodeCount / wantedGroups, (long)groupSize);
 
         Map<ClusterSpec.Group, Integer> allGroups = new HashMap<>();
-        for (Node node : tester.getNodes(application, Node.State.active).flavor(flavor)) {
+        for (Node node : tester.getNodes(application, Node.State.active).resources(nodeResources)) {
             ClusterSpec.Group group = node.allocation().get().membership().cluster().group().get();
             allGroups.put(group, nonretiredGroups.getOrDefault(group, 0) + 1);
         }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index 7ad8dbbf7bb..c490a951774 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -290,54 +290,6 @@ public class ProvisioningTest {
     }
 
     @Test
-    public void application_deployment_multiple_flavors_with_replacement() {
-        ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
-
-        ApplicationId application1 = tester.makeApplicationId();
-
-        tester.makeReadyNodes(8, "large");
-        tester.makeReadyNodes(8, "large-variant");
-
-        // deploy with flavor which will be fulfilled by some old and new nodes
-        SystemState state1 = prepare(application1, 2, 2, 4, 4,
-                                     NodeResources.fromLegacyName("old-large1"), tester);
-        tester.activate(application1, state1.allHosts);
-
-        // redeploy with increased sizes, this will map to the remaining old/new nodes
-        SystemState state2 = prepare(application1, 3, 4, 4, 5,
-                                     NodeResources.fromLegacyName("old-large2"), tester);
-        assertEquals("New nodes are reserved", 4, tester.getNodes(application1, Node.State.reserved).size());
-        tester.activate(application1, state2.allHosts);
-        assertEquals("All nodes are used",
-                    16, tester.getNodes(application1, Node.State.active).size());
-        assertEquals("No nodes are retired",
-                     0, tester.getNodes(application1, Node.State.active).retired().size());
-
-        // This is a noop as we are already using large nodes and nodes which replace large
-        SystemState state3 = prepare(application1, 3, 4, 4, 5,
-                                     NodeResources.fromLegacyName("large"), tester);
-        assertEquals("Noop", 0, tester.getNodes(application1, Node.State.reserved).size());
-        tester.activate(application1, state3.allHosts);
-
-        try {
-            SystemState state4 = prepare(application1, 3, 4, 4, 5,
-                                         NodeResources.fromLegacyName("large-variant"), tester);
-            fail("Should fail as we don't have that many large-variant nodes");
-        }
-        catch (OutOfCapacityException expected) {
-        }
-
-        // make enough nodes to complete the switch to large-variant
-        tester.makeReadyNodes(8, "large-variant");
-        SystemState state4 = prepare(application1, 3, 4, 4, 5,
-                                     NodeResources.fromLegacyName("large-variant"), tester);
-        assertEquals("New 'large-variant' nodes are reserved", 8, tester.getNodes(application1, Node.State.reserved).size());
-        tester.activate(application1, state4.allHosts);
-        // (we can not check for the precise state here without carrying over from earlier as the distribution of
-        // old and new on different clusters is unknown)
-    }
-
-    @Test
     public void application_deployment_above_then_at_capacity_limit() {
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
 
@@ -507,47 +459,6 @@ public class ProvisioningTest {
     }
 
     @Test
-    public void out_of_desired_flavor() {
-        ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
-
-        tester.makeReadyNodes(10, "small"); // need 2+2+3+3=10
-        tester.makeReadyNodes( 9, "large"); // need 2+2+3+3=10
-        ApplicationId application = tester.makeApplicationId();
-        try {
-            prepare(application, 2, 2, 3, 3,
-                    NodeResources.fromLegacyName("large"), tester);
-            fail("Expected exception");
-        }
-        catch (OutOfCapacityException e) {
-            assertTrue(e.getMessage().startsWith("Could not satisfy request for 3 nodes with flavor 'large'"));
-        }
-    }
-
-    @Test
-    public void out_of_capacity_no_replacements_for_retired_flavor() {
-        String flavorToRetire = "default";
-        String replacementFlavor = "new-default";
-
-        FlavorConfigBuilder b = new FlavorConfigBuilder();
-        b.addFlavor(flavorToRetire, 1., 1., 10, Flavor.Type.BARE_METAL).cost(2).retired(true);
-        FlavorsConfig.Flavor.Builder newDefault = b.addFlavor(replacementFlavor, 2., 2., 20,
-                                                              Flavor.Type.BARE_METAL).cost(2);
-        b.addReplaces(flavorToRetire, newDefault);
-
-        ProvisioningTester tester = new ProvisioningTester.Builder()
-                .zone(new Zone(Environment.prod, RegionName.from("us-east"))).flavorsConfig(b.build()).build();
-        ApplicationId application = tester.makeApplicationId();
-
-        try {
-            prepare(application, 2, 0, 2, 0,
-                    NodeResources.fromLegacyName(flavorToRetire), tester);
-            fail("Expected exception");
-        } catch (OutOfCapacityException e) {
-            assertTrue(e.getMessage().startsWith("Could not satisfy request"));
-        }
-    }
-
-    @Test
     public void out_of_capacity_all_nodes_want_to_retire() {
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
 
@@ -566,21 +477,6 @@ public class ProvisioningTest {
     }
 
     @Test
-    public void nonexisting_flavor() {
-        ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
-
-        ApplicationId application = tester.makeApplicationId();
-        try {
-            prepare(application, 2, 2, 3, 3,
-                    NodeResources.fromLegacyName("nonexisting"), tester);
-            fail("Expected exception");
-        }
-        catch (IllegalArgumentException e) {
-            assertEquals("Unknown flavor 'nonexisting'. Flavors are [default, dockerLarge, dockerSmall, large, old-large1, old-large2, small, v-4-8-100]", e.getMessage());
-        }
-    }
-
-    @Test
     public void highest_node_indexes_are_retired_first() {
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
 
@@ -610,96 +506,6 @@ public class ProvisioningTest {
     }
 
     @Test
-    public void application_deployment_prefers_cheapest_stock_nodes() {
-        assertCorrectBareMetalFlavorPreferences(true);
-    }
-
-    @Test
-    public void application_deployment_prefers_exact_nonstock_nodes() {
-        assertCorrectBareMetalFlavorPreferences(false);
-    }
-
-    @Test
-    public void application_deployment_retires_nodes_having_retired_flavor() {
-        String flavorToRetire = "default";
-        String replacementFlavor = "new-default";
-        ApplicationId application = ApplicationId.from(
-                TenantName.from(UUID.randomUUID().toString()),
-                ApplicationName.from(UUID.randomUUID().toString()),
-                InstanceName.from(UUID.randomUUID().toString()));
-        Curator curator = new MockCurator();
-        NameResolver nameResolver = new MockNameResolver().mockAnyLookup();
-
-        // Deploy with flavor that will eventually be retired
-        {
-            FlavorConfigBuilder b = new FlavorConfigBuilder();
-            b.addFlavor(flavorToRetire, 1., 1., 10, Flavor.Type.BARE_METAL).cost(2);
-
-            ProvisioningTester tester = new ProvisioningTester.Builder()
-                    .flavorsConfig(b.build()).curator(curator).nameResolver(nameResolver).build();
-            tester.makeReadyNodes(4, flavorToRetire);
-            SystemState state = prepare(application, 2, 0, 2, 0,
-                                        NodeResources.fromLegacyName(flavorToRetire), tester);
-            tester.activate(application, state.allHosts);
-        }
-
-        // Re-deploy with same flavor, which is now retired
-        {
-            // Retire "default" flavor and add "new-default" as replacement
-            FlavorConfigBuilder b = new FlavorConfigBuilder();
-            b.addFlavor(flavorToRetire, 1., 1., 10, Flavor.Type.BARE_METAL).cost(2).retired(true);
-            FlavorsConfig.Flavor.Builder newDefault = b.addFlavor(replacementFlavor, 2., 2., 20,
-                                                                  Flavor.Type.BARE_METAL).cost(2);
-            b.addReplaces(flavorToRetire, newDefault);
-
-            ProvisioningTester tester = new ProvisioningTester.Builder()
-                    .flavorsConfig(b.build()).curator(curator).nameResolver(nameResolver).build();
-
-            // Add nodes with "new-default" flavor
-            tester.makeReadyNodes(4, replacementFlavor);
-
-            SystemState state = prepare(application, 2, 0, 2, 0,
-                                        NodeResources.fromLegacyName(flavorToRetire), tester);
-
-            tester.activate(application, state.allHosts);
-
-            // Nodes with retired flavor are retired
-            NodeList retired = tester.getNodes(application).retired();
-            assertEquals(4, retired.size());
-            assertTrue("Nodes are retired by system", retired.asList().stream().allMatch(retiredBy(Agent.system)));
-        }
-    }
-
-    @Test
-    public void application_deployment_is_not_given_unallocated_nodes_having_retired_flavor() {
-        String flavorToRetire = "default";
-        String replacementFlavor = "new-default";
-
-        FlavorConfigBuilder b = new FlavorConfigBuilder();
-        b.addFlavor(flavorToRetire, 1., 1., 10, Flavor.Type.BARE_METAL).cost(2).retired(true);
-        FlavorsConfig.Flavor.Builder newDefault = b.addFlavor(replacementFlavor, 2., 2., 20,
-                                                              Flavor.Type.BARE_METAL).cost(2);
-        b.addReplaces(flavorToRetire, newDefault);
-
-        ProvisioningTester tester = new ProvisioningTester.Builder()
-                .zone(new Zone(Environment.prod, RegionName.from("us-east"))).flavorsConfig(b.build()).build();
-        ApplicationId application = tester.makeApplicationId();
-
-        // Add nodes
-        tester.makeReadyNodes(4, flavorToRetire);
-        tester.makeReadyNodes(4, replacementFlavor);
-
-        SystemState state = prepare(application, 2, 0, 2, 0,
-                                    NodeResources.fromLegacyName(flavorToRetire), tester);
-
-        tester.activate(application, state.allHosts);
-
-        List<Node> nodes = tester.getNodes(application).asList();
-        assertTrue("Allocated nodes have flavor " + replacementFlavor,
-                   nodes.stream().allMatch(n -> n.flavor().name().equals(replacementFlavor)));
-    }
-
-    @Test
     public void application_deployment_retires_nodes_that_want_to_retire() {
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();