summaryrefslogtreecommitdiffstats
path: root/controller-server/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2017-12-19 13:30:43 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2018-01-03 13:50:08 +0100
commitb3ae7caa9d7ed625d41328e6327e9a5ae87ed835 (patch)
treea3ba3ee124b251da0e333c0241a4d99554d2bbd9 /controller-server/src
parent615232d1cd53b20c7e91a2d445c4cd162c11e54b (diff)
Provide Athenz identity of configservers in ZoneRegistry
Diffstat (limited to 'controller-server/src')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java5
1 files changed, 5 insertions, 0 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 82434b6260c..21072f0b162 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
@@ -8,6 +8,7 @@ import com.yahoo.config.provision.RegionName;
import com.yahoo.config.provision.SystemName;
import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
+import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzService;
import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneFilter;
import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneFilterMock;
@@ -68,6 +69,10 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
return ZoneFilterMock.from(Collections.unmodifiableList(zones));
}
+ public AthenzService getConfigserverAthenzService(ZoneId zone) {
+ return new AthenzService("vespadomain", "provider-" + zone.environment().value() + "-" + zone.region().value());
+ }
+
@Override
public boolean hasZone(ZoneId zoneId) {
return zones.contains(zoneId);