GC confusing and void ClusterConfig.clusterId

2 files changed, 6 insertions, 7 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
index 02a7a946e17..9cba6fc04c0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
@@ -18,8 +18,8 @@ public class MockSearchClusters {
 
     private static class MockSearchCluster extends SearchCluster {
 
-        public MockSearchCluster(AbstractConfigProducerRoot root, String clusterName, int clusterIndex, boolean isStreaming) {
-            super(root, clusterName, clusterIndex);
+        public MockSearchCluster(AbstractConfigProducerRoot root, String clusterName,  boolean isStreaming) {
+            super(root, clusterName);
             streaming = isStreaming;
         }
 
@@ -36,15 +36,15 @@ public class MockSearchClusters {
 
     }
 
-    public static SearchCluster mockSearchCluster(AbstractConfigProducerRoot root, String clusterName, int clusterIndex, boolean isStreaming) {
+    public static SearchCluster mockSearchCluster(AbstractConfigProducerRoot root, String clusterName, boolean isStreaming) {
 
-        return new MockSearchCluster(root, clusterName, clusterIndex, isStreaming);
+        return new MockSearchCluster(root, clusterName, isStreaming);
     }
 
     public static Map<String, SearchCluster> twoMockClusterSpecsByName(AbstractConfigProducerRoot root) {
         Map<String, SearchCluster> result = new HashMap<>();
-        result.put("cluster1", mockSearchCluster(root, "cluster1", 1, false));
-        result.put("cluster2", mockSearchCluster(root, "cluster2", 2, true));
+        result.put("cluster1", mockSearchCluster(root, "cluster1", false));
+        result.put("cluster2", mockSearchCluster(root, "cluster2", true));
         return result;
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java
index 2423bae4761..5a316f69a9f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java
@@ -87,7 +87,6 @@ public class SchemaChainsTest extends SchemaChainsTestBase {
 
     @Test
     void validateLocalProviderConfig() {
-        assertEquals(2, clusterConfig.clusterId());
         assertEquals("cluster2", clusterConfig.clusterName());
     }