diff options
author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-07-18 17:00:22 +0200 |
---|---|---|
committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-07-18 17:00:22 +0200 |
commit | 094fa05c0eaae2b302cf6f35b4c68b08b2172fd0 (patch) | |
tree | bc84674438026ca6db77906b8def69d06d844bdd /controller-server | |
parent | 2b7a2ac21fd15eaaf5defc6a87f76531fd435a9e (diff) |
Make AthenzDomain for the system available from ZoneRegistry
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 f802a6af549..0cc24d3eeae 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 @@ -6,6 +6,7 @@ import com.google.inject.Inject; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.component.AbstractComponent; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.CloudName; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; @@ -27,7 +28,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.stream.Collectors; /** * @author mpolden @@ -108,6 +108,11 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry } @Override + public AthenzDomain getSystemAthenzDomain() { + return AthenzDomain.from("vespadomain"); + } + + @Override public UpgradePolicy upgradePolicy() { return upgradePolicy; } |