Revert "Revert "Bratseth/vip logic take 2""

1 files changed, 8 insertions, 1 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/MockSearchCluster.java b/container-search/src/test/java/com/yahoo/search/dispatch/MockSearchCluster.java
index 7ee62ae9978..e3ff54102d4 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/MockSearchCluster.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/MockSearchCluster.java
@@ -10,6 +10,7 @@ import com.yahoo.search.dispatch.searchcluster.SearchCluster;
 import com.yahoo.vespa.config.search.DispatchConfig;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -89,7 +90,7 @@ public class MockSearchCluster extends SearchCluster {
     }
 
     @Override
-    public Optional<Node> directDispatchTarget() {
+    public Optional<Node> localCorpusDispatchTarget() {
         return Optional.empty();
     }
 
@@ -106,8 +107,14 @@ public class MockSearchCluster extends SearchCluster {
     public static DispatchConfig createDispatchConfig(Node... nodes) {
         return createDispatchConfig(100.0, nodes);
     }
+    public static DispatchConfig createDispatchConfig(List<Node> nodes) {
+        return createDispatchConfig(100.0, nodes);
+    }
 
     public static DispatchConfig createDispatchConfig(double minSearchCoverage, Node... nodes) {
+        return createDispatchConfig(minSearchCoverage, Arrays.asList(nodes));
+    }
+    public static DispatchConfig createDispatchConfig(double minSearchCoverage, List<Node> nodes) {
         DispatchConfig.Builder builder = new DispatchConfig.Builder();
         builder.minActivedocsPercentage(88.0);
         builder.minGroupCoverage(99.0);