Model group ids as indexes

1 files changed, 0 insertions, 74 deletions

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 38702d6920f..34f75d46a1c 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
@@ -278,80 +278,6 @@ public class ModelProvisioningTest {
     }
 
     @Test
-    public void testNodeCountForContentGroupHierarchy() {
-        String services = 
-                "<?xml version='1.0' encoding='utf-8' ?>\n" +
-                        "<services>\n" +
-                        "\n" +
-                        "  <admin version='3.0'>\n" +
-                        "    <nodes count='3'/>" + // Ignored
-                        "  </admin>\n" +
-                        "  <content version='1.0' id='bar'>" +
-                        "    <redundancy>2</redundancy>\n" +
-                        "    <documents>" +
-                        "      <document type='type1' mode='index'/>" +
-                        "    </documents>" +
-                        "    <group>" +
-                        "      <distribution partitions=\"1|*\"/>" +
-                        "      <group name='0' distribution-key='0'>" +
-                        "        <nodes count='2'/> " +
-                        "      </group>" +
-                        "      <group name='1' distribution-key='1'>" +
-                        "        <nodes count='2'/> " +
-                        "      </group>" +
-                        "    </group>" +
-                        "  </content>" +
-                        "  <content version='1.0' id='baz'>" +
-                        "    <redundancy>2</redundancy>\n" +
-                        "    <documents>" +
-                        "      <document type='type1' mode='index'/>" +
-                        "    </documents>" +
-                        "    <group>" +
-                        "      <distribution partitions=\"1|*\"/>" +
-                        "      <group name='0' distribution-key='10'>" +
-                        "        <nodes count='1'/> " +
-                        "      </group>" +
-                        "      <group name='1' distribution-key='11'>" +
-                        "        <nodes count='1'/> " +
-                        "      </group>" +
-                        "    </group>" +
-                        "  </content>" +
-                        "\n" +
-                        "</services>";
-        
-        int numberOfHosts = 6;
-        VespaModelTester tester = new VespaModelTester();
-        tester.addHosts(numberOfHosts);
-        VespaModel model = tester.createModel(services, true);
-        assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts));
-        
-        ContentCluster cluster = model.getContentClusters().get("bar");
-        assertThat(cluster.getRootGroup().getNodes().size(), is(0));
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0"));
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().size(), is(2));
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey(), is(0));
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("bar/storage/0"));
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getDistributionKey(), is(1));
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getConfigId(), is("bar/storage/1"));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("1"));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(2));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(2));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("bar/storage/2"));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getDistributionKey(), is(3));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getConfigId(), is("bar/storage/3"));
-
-        cluster = model.getContentClusters().get("baz");
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("10"));
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().size(), is(1));
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey(), is(0));
-        assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("baz/storage/0"));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("11"));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(1));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(1));
-        assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("baz/storage/1"));
-    }
-
-    @Test
     public void testUsingNodesAndGroupCountAttributes() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +