diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-10-24 15:22:39 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-10-24 15:22:39 +0200 |
commit | 2299eadb564187c86f584ec0a5e41c8834f68748 (patch) | |
tree | dfcf2b2d1b0d5b6e62c40563ea18e02cb0e02fb6 | |
parent | bbaeb599e433f0d3cb41621d2ec6c324183ce707 (diff) |
Add controller api endpoint to ZoneRegistry
2 files changed, 8 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java index bb201a323a2..d808b4b7adb 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java @@ -87,4 +87,7 @@ public interface ZoneRegistry { /** Returns a URL used to generate flashy badges from strings. */ URI badgeUrl(); + /** Returns a URL to the controller's api endpoint */ + URI apiUrl(); + } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java index 5c13ae62c90..32bbf3ceb9b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java @@ -165,6 +165,11 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry } @Override + public URI apiUrl() { + return URI.create("https://api.tld:4443/"); + } + + @Override public boolean hasZone(ZoneId zoneId) { return zones.stream().anyMatch(zone -> zone.getId().equals(zoneId)); } |