From be5ea0ad39c15c13fb85a70d9990165499a92896 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Tue, 5 Jan 2021 14:50:46 +0100 Subject: Revert "Revert "Jonmv/remove storage policy"" This reverts commit 75b2e4c11ea6463c335f1c77dab3fdb5493e5600. --- .../src/main/java/com/yahoo/vespaget/DocumentRetriever.java | 2 +- vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vespaclient-java/src/main/java/com/yahoo') diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java index 6c8296d7979..ebed1685a5f 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java @@ -116,7 +116,7 @@ public class DocumentRetriever { "The Vespa cluster contains the content clusters %s, not %s. Please select a valid vespa cluster.", names, clusterName)); } - return String.format("[Storage:cluster=%s;clusterconfigid=%s]", clusterDef.getName(), clusterDef.getConfigId()); + return clusterDef.getRoute(); } private LoadType resolveLoadType(String loadTypeName) throws DocumentRetrieverException { diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java index 88eed9dfc59..b1f91e44e5c 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java @@ -600,7 +600,7 @@ public class VdsVisit { names + ". Please use the -c option to select one of them as a target for visiting."); } - return "[Storage:cluster=" + found.getName() + ";clusterconfigid=" + found.getConfigId() + "]"; + return found.getRoute(); } protected static void verbosePrintParameters(VdsVisitParameters vdsParams, PrintStream out) { -- cgit v1.2.3