Fetch flag value for architecture for admin clusters correctly

4 files changed, 47 insertions, 48 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
index 8bf6dc7f1d9..a6bcf6b0fd2 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
@@ -36,7 +36,7 @@ import java.util.stream.IntStream;
  */
 public class InMemoryProvisioner implements HostProvisioner {
 
-    public static final NodeResources defaultResources = new NodeResources(1, 3, 10, 1);
+    public static final NodeResources defaultResources = new NodeResources(1, 3, 50, 1);
 
     /**
      * If this is true an exception is thrown when all nodes are used.
@@ -153,7 +153,7 @@ public class InMemoryProvisioner implements HostProvisioner {
         if (alwaysReturnOneNode)
             nodes = 1;
 
-        int groups = requested.groups() > nodes ? nodes : requested.groups();
+        int groups = Math.min(requested.groups(), nodes);
 
         List<HostSpec> allocation = new ArrayList<>();
         if (groups == 1) {
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 582ab18f904..183ab56d45f 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -553,7 +553,7 @@ public class ModelProvisioningTest {
         assertEquals(3, subGroups.get(0).getNodes().size());
         assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey());
         assertEquals("bar/storage/0", subGroups.get(0).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-57", subGroups.get(0).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-57", subGroups.get(0).getNodes().get(0).getHostName());
         assertEquals(1, subGroups.get(0).getNodes().get(1).getDistributionKey());
         assertEquals("bar/storage/1", subGroups.get(0).getNodes().get(1).getConfigId());
         assertEquals(2, subGroups.get(0).getNodes().get(2).getDistributionKey());
@@ -562,13 +562,13 @@ public class ModelProvisioningTest {
         assertEquals(3, subGroups.get(1).getNodes().size());
         assertEquals(3, subGroups.get(1).getNodes().get(0).getDistributionKey());
         assertEquals("bar/storage/3", subGroups.get(1).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-54", subGroups.get(1).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-54", subGroups.get(1).getNodes().get(0).getHostName());
         assertEquals(4, subGroups.get(1).getNodes().get(1).getDistributionKey());
         assertEquals("bar/storage/4", subGroups.get(1).getNodes().get(1).getConfigId());
         assertEquals(5, subGroups.get(1).getNodes().get(2).getDistributionKey());
         assertEquals("bar/storage/5", subGroups.get(1).getNodes().get(2).getConfigId());
         // ...
-        assertEquals("node-1-3-10-51", subGroups.get(2).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-51", subGroups.get(2).getNodes().get(0).getHostName());
         // ...
         assertEquals("8", subGroups.get(8).getIndex());
         assertEquals(3, subGroups.get(8).getNodes().size());
@@ -587,14 +587,14 @@ public class ModelProvisioningTest {
         assertEquals(1, subGroups.get(0).getNodes().size());
         assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey());
         assertEquals("baz/storage/0", subGroups.get(0).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-27", subGroups.get(0).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-27", subGroups.get(0).getNodes().get(0).getHostName());
         assertEquals("1", subGroups.get(1).getIndex());
         assertEquals(1, subGroups.get(1).getNodes().size());
         assertEquals(1, subGroups.get(1).getNodes().get(0).getDistributionKey());
         assertEquals("baz/storage/1", subGroups.get(1).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-26", subGroups.get(1).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-26", subGroups.get(1).getNodes().get(0).getHostName());
         // ...
-        assertEquals("node-1-3-10-25", subGroups.get(2).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-25", subGroups.get(2).getNodes().get(0).getHostName());
         // ...
         assertEquals("26", subGroups.get(26).getIndex());
         assertEquals(1, subGroups.get(26).getNodes().size());
@@ -694,7 +694,7 @@ public class ModelProvisioningTest {
         assertEquals(3, subGroups.get(0).getNodes().size());
         assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey());
         assertEquals("bar/storage/0", subGroups.get(0).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-57", subGroups.get(0).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-57", subGroups.get(0).getNodes().get(0).getHostName());
         assertEquals(1, subGroups.get(0).getNodes().get(1).getDistributionKey());
         assertEquals("bar/storage/1", subGroups.get(0).getNodes().get(1).getConfigId());
         assertEquals(2, subGroups.get(0).getNodes().get(2).getDistributionKey());
@@ -703,13 +703,13 @@ public class ModelProvisioningTest {
         assertEquals(3, subGroups.get(1).getNodes().size());
         assertEquals(3, subGroups.get(1).getNodes().get(0).getDistributionKey());
         assertEquals("bar/storage/3", subGroups.get(1).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-54", subGroups.get(1).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-54", subGroups.get(1).getNodes().get(0).getHostName());
         assertEquals(4, subGroups.get(1).getNodes().get(1).getDistributionKey());
         assertEquals("bar/storage/4", subGroups.get(1).getNodes().get(1).getConfigId());
         assertEquals(5, subGroups.get(1).getNodes().get(2).getDistributionKey());
         assertEquals("bar/storage/5", subGroups.get(1).getNodes().get(2).getConfigId());
         // ...
-        assertEquals("node-1-3-10-51", subGroups.get(2).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-51", subGroups.get(2).getNodes().get(0).getHostName());
         // ...
         assertEquals("8", subGroups.get(8).getIndex());
         assertEquals(3, subGroups.get(8).getNodes().size());
@@ -728,14 +728,14 @@ public class ModelProvisioningTest {
         assertEquals(1, subGroups.get(0).getNodes().size());
         assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey());
         assertEquals("baz/storage/0", subGroups.get(0).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-27", subGroups.get(0).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-27", subGroups.get(0).getNodes().get(0).getHostName());
         assertEquals("1", subGroups.get(1).getIndex());
         assertEquals(1, subGroups.get(1).getNodes().size());
         assertEquals(1, subGroups.get(1).getNodes().get(0).getDistributionKey());
         assertEquals("baz/storage/1", subGroups.get(1).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-26", subGroups.get(1).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-26", subGroups.get(1).getNodes().get(0).getHostName());
         // ...
-        assertEquals("node-1-3-10-25", subGroups.get(2).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-25", subGroups.get(2).getNodes().get(0).getHostName());
         // ...
         assertEquals("26", subGroups.get(26).getIndex());
         assertEquals(1, subGroups.get(26).getNodes().size());
@@ -770,9 +770,9 @@ public class ModelProvisioningTest {
         ClusterControllerContainerCluster clusterControllers = model.getAdmin().getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("cluster-controllers", clusterControllers.getName());
-        assertEquals("node-1-3-10-03", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("node-1-3-10-02", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("node-1-3-10-01", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("node-1-3-50-03", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("node-1-3-50-02", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("node-1-3-50-01", clusterControllers.getContainers().get(2).getHostName());
 
         // Check content cluster
         ContentCluster cluster = model.getContentClusters().get("bar");
@@ -785,19 +785,19 @@ public class ModelProvisioningTest {
         assertEquals(1, subGroups.get(0).getNodes().size());
         assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey());
         assertEquals("bar/storage/0", subGroups.get(0).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-11", subGroups.get(0).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-11", subGroups.get(0).getNodes().get(0).getHostName());
         // second group
         assertEquals("1", subGroups.get(1).getIndex());
         assertEquals(1, subGroups.get(1).getNodes().size());
         assertEquals(1, subGroups.get(1).getNodes().get(0).getDistributionKey());
         assertEquals("bar/storage/1", subGroups.get(1).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-10", subGroups.get(1).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-10", subGroups.get(1).getNodes().get(0).getHostName());
         // ... last group
         assertEquals("7", subGroups.get(7).getIndex());
         assertEquals(1, subGroups.get(7).getNodes().size());
         assertEquals(7, subGroups.get(7).getNodes().get(0).getDistributionKey());
         assertEquals("bar/storage/7", subGroups.get(7).getNodes().get(0).getConfigId());
-        assertEquals("node-1-3-10-04", subGroups.get(7).getNodes().get(0).getHostName());
+        assertEquals("node-1-3-50-04", subGroups.get(7).getNodes().get(0).getHostName());
     }
 
     @Test
@@ -814,15 +814,15 @@ public class ModelProvisioningTest {
         int numberOfHosts = 11;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, true, "node-1-3-10-09");
+        VespaModel model = tester.createModel(services, true, "node-1-3-50-09");
         assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
 
         // Check slobroks clusters
         assertEquals("Includes retired node", 1+3, model.getAdmin().getSlobroks().size());
-        assertEquals("node-1-3-10-11", model.getAdmin().getSlobroks().get(0).getHostName());
-        assertEquals("node-1-3-10-10", model.getAdmin().getSlobroks().get(1).getHostName());
-        assertEquals("node-1-3-10-08", model.getAdmin().getSlobroks().get(2).getHostName());
-        assertEquals("Included in addition because it is retired", "node-1-3-10-09", model.getAdmin().getSlobroks().get(3).getHostName());
+        assertEquals("node-1-3-50-11", model.getAdmin().getSlobroks().get(0).getHostName());
+        assertEquals("node-1-3-50-10", model.getAdmin().getSlobroks().get(1).getHostName());
+        assertEquals("node-1-3-50-08", model.getAdmin().getSlobroks().get(2).getHostName());
+        assertEquals("Included in addition because it is retired", "node-1-3-50-09", model.getAdmin().getSlobroks().get(3).getHostName());
     }
 
     @Test
@@ -839,16 +839,16 @@ public class ModelProvisioningTest {
         int numberOfHosts = 12;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, true, "node-1-3-10-03", "node-1-3-10-04");
+        VespaModel model = tester.createModel(services, true, "node-1-3-50-03", "node-1-3-50-04");
         assertEquals(10+2, model.getRoot().hostSystem().getHosts().size());
 
         // Check slobroks clusters
         assertEquals("Includes retired node", 3+2, model.getAdmin().getSlobroks().size());
-        assertEquals("node-1-3-10-12", model.getAdmin().getSlobroks().get(0).getHostName());
-        assertEquals("node-1-3-10-11", model.getAdmin().getSlobroks().get(1).getHostName());
-        assertEquals("node-1-3-10-10", model.getAdmin().getSlobroks().get(2).getHostName());
-        assertEquals("Included in addition because it is retired", "node-1-3-10-04", model.getAdmin().getSlobroks().get(3).getHostName());
-        assertEquals("Included in addition because it is retired", "node-1-3-10-03", model.getAdmin().getSlobroks().get(4).getHostName());
+        assertEquals("node-1-3-50-12", model.getAdmin().getSlobroks().get(0).getHostName());
+        assertEquals("node-1-3-50-11", model.getAdmin().getSlobroks().get(1).getHostName());
+        assertEquals("node-1-3-50-10", model.getAdmin().getSlobroks().get(2).getHostName());
+        assertEquals("Included in addition because it is retired", "node-1-3-50-04", model.getAdmin().getSlobroks().get(3).getHostName());
+        assertEquals("Included in addition because it is retired", "node-1-3-50-03", model.getAdmin().getSlobroks().get(4).getHostName());
     }
 
     @Test
@@ -868,19 +868,19 @@ public class ModelProvisioningTest {
         int numberOfHosts = 16;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, true, "node-1-3-10-15", "node-1-3-10-05", "node-1-3-10-04");
+        VespaModel model = tester.createModel(services, true, "node-1-3-50-15", "node-1-3-50-05", "node-1-3-50-04");
         assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
 
         // Check slobroks clusters
         // ... from cluster default
         assertEquals("Includes retired node", 7, model.getAdmin().getSlobroks().size());
-        assertEquals("node-1-3-10-16", model.getAdmin().getSlobroks().get(0).getHostName());
-        assertEquals("node-1-3-10-14", model.getAdmin().getSlobroks().get(1).getHostName());
-        assertEquals("Included in addition because it is retired", "node-1-3-10-15", model.getAdmin().getSlobroks().get(2).getHostName());
+        assertEquals("node-1-3-50-16", model.getAdmin().getSlobroks().get(0).getHostName());
+        assertEquals("node-1-3-50-14", model.getAdmin().getSlobroks().get(1).getHostName());
+        assertEquals("Included in addition because it is retired", "node-1-3-50-15", model.getAdmin().getSlobroks().get(2).getHostName());
         // ... from cluster bar
-        assertEquals("node-1-3-10-03", model.getAdmin().getSlobroks().get(3).getHostName());
-        assertEquals("Included in addition because it is retired", "node-1-3-10-05", model.getAdmin().getSlobroks().get(5).getHostName());
-        assertEquals("Included in addition because it is retired", "node-1-3-10-04", model.getAdmin().getSlobroks().get(6).getHostName());
+        assertEquals("node-1-3-50-03", model.getAdmin().getSlobroks().get(3).getHostName());
+        assertEquals("Included in addition because it is retired", "node-1-3-50-05", model.getAdmin().getSlobroks().get(5).getHostName());
+        assertEquals("Included in addition because it is retired", "node-1-3-50-04", model.getAdmin().getSlobroks().get(6).getHostName());
     }
 
     @Test
@@ -1107,7 +1107,7 @@ public class ModelProvisioningTest {
         int numberOfHosts = 3;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, false, "node-1-3-10-03");
+        VespaModel model = tester.createModel(services, false, "node-1-3-50-03");
         assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
 
         ContentCluster cluster = model.getContentClusters().get("bar");
@@ -1136,7 +1136,7 @@ public class ModelProvisioningTest {
         int numberOfHosts = 5;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, false, "node-1-3-10-05", "node-1-3-10-04", "node-1-3-10-03");
+        VespaModel model = tester.createModel(services, false, "node-1-3-50-05", "node-1-3-50-04", "node-1-3-50-03");
         assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
 
         ContentCluster cluster = model.getContentClusters().get("bar");
@@ -1165,7 +1165,7 @@ public class ModelProvisioningTest {
         int numberOfHosts = 3;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, false, false, true, "node-1-3-10-03");
+        VespaModel model = tester.createModel(services, false, false, true, "node-1-3-50-03");
         assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
 
         ContentCluster cluster = model.getContentClusters().get("bar");
@@ -1502,9 +1502,8 @@ public class ModelProvisioningTest {
         tester.setHosted(true);
         tester.setAdminClusterArchitecture(Architecture.arm64);
         tester.useDedicatedNodeForLogserver(true);
-        tester.addHosts(new NodeResources(13.5, 100,         1000, 0.3), 6);
-        tester.addHosts(new NodeResources(85,   200, 1000_000_000, 0.3), 20);
-        tester.addHosts(new NodeResources(0.5, 2, 10, 0.3, DiskSpeed.any, StorageType.any, Architecture.arm64), 4);
+        tester.addHosts(new NodeResources(13.5, 100, 1000, 0.3), 4);
+        tester.addHosts(new NodeResources(0.5, 2, 50, 0.3, DiskSpeed.fast, StorageType.any, Architecture.arm64), 4); // 3 ccs, 1 logserver
         VespaModel model = tester.createModel(services, true, true);
         List<HostResource> hosts = model.getRoot().hostSystem().getHosts();
         assertEquals(8, hosts.size());
@@ -2147,7 +2146,7 @@ public class ModelProvisioningTest {
                 "</services>";
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(4);
-        VespaModel model = tester.createModel(servicesXml, true, "node-1-3-10-04");
+        VespaModel model = tester.createModel(servicesXml, true, "node-1-3-50-04");
         ApplicationContainerCluster cluster = model.getContainerClusters().get("zk");
         assertEquals(1, cluster.getContainers().stream().filter(Container::isRetired).count());
         assertEquals(3, cluster.getContainers().stream().filter(c -> !c.isRetired()).count());
@@ -2176,7 +2175,7 @@ public class ModelProvisioningTest {
             assertTrue("Initial servers are not joining", config.build().server().stream().noneMatch(ZookeeperServerConfig.Server::joining));
         }
         {
-            VespaModel nextModel = tester.createModel(Zone.defaultZone(), servicesXml.apply(3), true, false, false, 0, Optional.of(model), new DeployState.Builder(), "node-1-3-10-04", "node-1-3-10-03");
+            VespaModel nextModel = tester.createModel(Zone.defaultZone(), servicesXml.apply(3), true, false, false, 0, Optional.of(model), new DeployState.Builder(), "node-1-3-50-04", "node-1-3-50-03");
             ApplicationContainerCluster cluster = nextModel.getContainerClusters().get("zk");
             ZookeeperServerConfig.Builder config = new ZookeeperServerConfig.Builder();
             cluster.getContainers().forEach(c -> c.getConfig(config));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
index c00a5f65d08..7bf08461df7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
@@ -104,7 +104,7 @@ public class MetricsProxyContainerClusterTest {
 
     private void assertNodeConfig(MetricsNodesConfig.Node node) {
         assertTrue(node.role().startsWith("container/foo/0/"));
-        assertTrue(node.hostname().startsWith("node-1-3-10-"));
+        assertTrue(node.hostname().startsWith("node-1-3-50-"));
         assertEquals(MetricsProxyContainer.BASEPORT, node.metricsPort());
         assertEquals(MetricsV1Handler.VALUES_PATH, node.metricsPath());
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
index ad3a163f052..9b1ff54482b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
@@ -136,7 +136,7 @@ public class MetricsProxyContainerTest {
 
         NodeInfoConfig config = hostedModel.getConfig(NodeInfoConfig.class, metricsV2Handler.getConfigId());
         assertTrue(config.role().startsWith("content/my-content/0/"));
-        assertTrue(config.hostname().startsWith("node-1-3-10-"));
+        assertTrue(config.hostname().startsWith("node-1-3-50-"));
     }
 
     @Test