diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-01-05 12:29:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-05 12:29:17 +0100 |
commit | 75b2e4c11ea6463c335f1c77dab3fdb5493e5600 (patch) | |
tree | 1c01f7e4d6492ed9e508d8841f975e2c1fc177c6 /vespaclient-java | |
parent | 25f217ff7f0c4f8ae921b71788a083c6b6acf2cc (diff) |
Revert "Jonmv/remove storage policy"
Diffstat (limited to 'vespaclient-java')
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 ebed1685a5f..6c8296d7979 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 clusterDef.getRoute(); + return String.format("[Storage:cluster=%s;clusterconfigid=%s]", clusterDef.getName(), clusterDef.getConfigId()); } 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 b1f91e44e5c..88eed9dfc59 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 found.getRoute(); + return "[Storage:cluster=" + found.getName() + ";clusterconfigid=" + found.getConfigId() + "]"; } 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 d6bda4b8bc1..d8b5c267bf2 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", - expectedRoute = "storage-direct"; + final String cluster = "storage", configId = "content/cluster.foo/storage", + expectedRoute = "[Storage:cluster=storage;clusterconfigid=content/cluster.foo/storage]"; ClientParameters params = createParameters() .setCluster(cluster) .build(); - ClusterList clusterList = new ClusterList(Collections.singletonList(new ClusterDef(cluster))); + ClusterList clusterList = new ClusterList(Collections.singletonList(new ClusterDef(cluster, configId))); 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"))); + ClusterList clusterList = new ClusterList(Collections.singletonList(new ClusterDef("storage", "content/cluster.foo/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 7828fbb249d..4c8fbb1beee 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")); + clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage")); ClusterList clusterList = new ClusterList(clusterDefs); String route = VdsVisit.resolveClusterRoute(clusterList, null); - assertEquals("storage-direct", route); + assertEquals("[Storage:cluster=storage;clusterconfigid=content/cluster.foo/storage]", route); } @Test public void testBadClusterName() throws Exception { List<ClusterDef> clusterDefs = new ArrayList<>(); - clusterDefs.add(new ClusterDef("storage")); + clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/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")); - clusterDefs.add(new ClusterDef("storage2")); + clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage")); + clusterDefs.add(new ClusterDef("storage2", "content/cluster.bar/storage")); 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")); - clusterDefs.add(new ClusterDef("storage2")); + clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage")); + clusterDefs.add(new ClusterDef("storage2", "content/cluster.bar/storage")); ClusterList clusterList = new ClusterList(clusterDefs); String route = VdsVisit.resolveClusterRoute(clusterList, "storage2"); - assertEquals("storage2-direct", route); + assertEquals("[Storage:cluster=storage2;clusterconfigid=content/cluster.bar/storage]", route); } @Test |