aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src/test/java
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-12-02 10:57:29 +0100
committerMartin Polden <mpolden@mpolden.no>2021-12-02 11:03:29 +0100
commitcccfb34661a0c90727c1a464e4c0af9c38fb38ac (patch)
tree4a35614b428a802c77a9901febe59554ba4b7cb8 /configserver/src/test/java
parent5574198029611974efac98e383779a0008621208 (diff)
Support changing the status of multiple upstreams
Diffstat (limited to 'configserver/src/test/java')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandlerTest.java16
1 files changed, 14 insertions, 2 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandlerTest.java
index 3eed93ce131..760607d538f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandlerTest.java
@@ -62,7 +62,7 @@ public class RoutingStatusApiHandlerTest {
statusOut());
}
String actual = responseAsString(executeRequest(Method.GET, "/routing/v1/status", null));
- assertEquals("[\"foo\",\"bar\"]", actual);
+ assertEquals("[\"bar\",\"foo\"]", actual);
}
@Test
@@ -88,8 +88,20 @@ public class RoutingStatusApiHandlerTest {
// Read status stored in old format (path exists, but without content)
curator.set(Path.fromString("/routing/v1/status/" + upstreamName), new byte[0]);
response = responseAsString(executeRequest(Method.GET, "/routing/v1/status/" + upstreamName + "?application=" + instance.serializedForm(), null));
-
assertEquals(response("OUT", "", "", clock.instant()), response);
+
+ // Change status of multiple upstreams
+ deployer.failNextDeployment(false);
+ String upstreamName2 = "upstream2";
+ String upstreams = upstreamName + "," + upstreamName2;
+ response = responseAsString(executeRequest(Method.PUT, "/routing/v1/status/" + upstreams + "?application=" + instance.serializedForm(),
+ statusOut()));
+ String outResponse = response("OUT", "issue-XXX", "operator", clock.instant());
+ assertEquals(outResponse, response);
+ for (var upstreamName : List.of(upstreamName, upstreamName2)) {
+ response = responseAsString(executeRequest(Method.GET, "/routing/v1/status/" + upstreamName + "?application=" + instance.serializedForm(), null));
+ assertEquals(outResponse, response);
+ }
}
@Test