Revert "Revert "Jonmv/remove storage policy""

This reverts commit 75b2e4c11ea6463c335f1c77dab3fdb5493e5600.

4 files changed, 14 insertions, 14 deletions

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) {
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
index d8b5c267bf2..d6bda4b8bc1 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
@@ -234,14 +234,14 @@ public class DocumentRetrieverTest {
 
     @Test
     public void testClusterLookup() throws DocumentRetrieverException {
-        final String cluster = "storage", configId = "content/cluster.foo/storage",
-                expectedRoute = "[Storage:cluster=storage;clusterconfigid=content/cluster.foo/storage]";
+        final String cluster = "storage",
+                expectedRoute = "storage-direct";
 
         ClientParameters params = createParameters()
                 .setCluster(cluster)
                 .build();
 
-        ClusterList clusterList = new ClusterList(Collections.singletonList(new ClusterDef(cluster, configId)));
+        ClusterList clusterList = new ClusterList(Collections.singletonList(new ClusterDef(cluster)));
 
         DocumentRetriever documentRetriever = createDocumentRetriever(params, clusterList);
         documentRetriever.retrieveDocuments();
@@ -258,7 +258,7 @@ public class DocumentRetrieverTest {
                 .setCluster("invalidclustername")
                 .build();
 
-        ClusterList clusterList = new ClusterList(Collections.singletonList(new ClusterDef("storage", "content/cluster.foo/storage")));
+        ClusterList clusterList = new ClusterList(Collections.singletonList(new ClusterDef("storage")));
 
         DocumentRetriever documentRetriever = createDocumentRetriever(params, clusterList);
         documentRetriever.retrieveDocuments();
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
index 4c8fbb1beee..7828fbb249d 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
@@ -228,17 +228,17 @@ public class VdsVisitTestCase {
     @Test
     public void testAutoSelectClusterRoute() throws Exception {
         List<ClusterDef> clusterDefs = new ArrayList<>();
-        clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage"));
+        clusterDefs.add(new ClusterDef("storage"));
         ClusterList clusterList = new ClusterList(clusterDefs);
 
         String route = VdsVisit.resolveClusterRoute(clusterList, null);
-        assertEquals("[Storage:cluster=storage;clusterconfigid=content/cluster.foo/storage]", route);
+        assertEquals("storage-direct", route);
     }
 
     @Test
     public void testBadClusterName() throws Exception {
         List<ClusterDef> clusterDefs = new ArrayList<>();
-        clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage"));
+        clusterDefs.add(new ClusterDef("storage"));
         ClusterList clusterList = new ClusterList(clusterDefs);
         try {
             VdsVisit.resolveClusterRoute(clusterList, "borkbork");
@@ -252,8 +252,8 @@ public class VdsVisitTestCase {
     @Test
     public void testRequireClusterOptionIfMultipleClusters() {
         List<ClusterDef> clusterDefs = new ArrayList<>();
-        clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage"));
-        clusterDefs.add(new ClusterDef("storage2", "content/cluster.bar/storage"));
+        clusterDefs.add(new ClusterDef("storage"));
+        clusterDefs.add(new ClusterDef("storage2"));
         ClusterList clusterList = new ClusterList(clusterDefs);
         try {
             VdsVisit.resolveClusterRoute(clusterList, null);
@@ -265,12 +265,12 @@ public class VdsVisitTestCase {
     @Test
     public void testExplicitClusterOptionWithMultipleClusters() {
         List<ClusterDef> clusterDefs = new ArrayList<>();
-        clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage"));
-        clusterDefs.add(new ClusterDef("storage2", "content/cluster.bar/storage"));
+        clusterDefs.add(new ClusterDef("storage"));
+        clusterDefs.add(new ClusterDef("storage2"));
         ClusterList clusterList = new ClusterList(clusterDefs);
 
         String route = VdsVisit.resolveClusterRoute(clusterList, "storage2");
-        assertEquals("[Storage:cluster=storage2;clusterconfigid=content/cluster.bar/storage]", route);
+        assertEquals("storage2-direct", route);
     }
 
     @Test