summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2017-12-12 16:17:48 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2017-12-12 16:17:48 +0100
commit26b228622a21ab284a2649418a962908551a063f (patch)
treeb431cea2ff7df4872bb671f917580d6bf4535093 /controller-server
parent62f194fdfc61c6326b98e7fae76657100ca2f029 (diff)
Added new secure config server uri stuff
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
index 13832cbf72a..95e71e4d63a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
@@ -74,10 +74,12 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
@Override
public List<URI> getConfigServerUris(ZoneId zoneId) {
- return Optional.of(zoneId)
- .map(z -> URI.create(String.format("http://cfg.%s.test", zoneId.value())))
- .map(Collections::singletonList)
- .orElse(Collections.emptyList());
+ return Collections.singletonList(URI.create(String.format("http://cfg.%s.test", zoneId.value())));
+ }
+
+ @Override
+ public List<URI> getConfigServerSecureUris(ZoneId zoneId) {
+ return Collections.singletonList(URI.create(String.format("https://cfg.%s.test:4443", zoneId.value())));
}
@Override