diff options
author | Valerij Fredriksen <valerij92@gmail.com> | 2019-06-01 16:58:08 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerij92@gmail.com> | 2019-06-01 17:14:39 +0200 |
commit | b0154dbc54bf7257d4d1803c4b0895b11f56335b (patch) | |
tree | f849ab30fa13c36d6e34f0b0a36d025bc96778c7 /service-monitor | |
parent | ee6b26191c0855396971a5b23c2f7cbe6142367c (diff) |
Only deploy supported infrastructure applications
Diffstat (limited to 'service-monitor')
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java | 6 | ||||
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/monitor/DuperModelInfraApi.java | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java index 2477c77bdad..c9cd4528bec 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; @@ -94,6 +95,11 @@ public class DuperModelManager implements DuperModelInfraApi { return new ArrayList<>(supportedInfraApplications.values()); } + @Override + public Optional<InfraApplicationApi> getInfraApplication(ApplicationId applicationId) { + return Optional.ofNullable(supportedInfraApplications.get(applicationId)); + } + /** * Returns true if application is considered an infrastructure application by the DuperModel. * diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/DuperModelInfraApi.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/DuperModelInfraApi.java index c5c96921fa1..d08bba2bd3d 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/DuperModelInfraApi.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/DuperModelInfraApi.java @@ -5,6 +5,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostName; import java.util.List; +import java.util.Optional; /** * The DuperModel's API for infrastructure applications. @@ -15,6 +16,9 @@ public interface DuperModelInfraApi { /** Returns the list of supported infrastructure applications. */ List<InfraApplicationApi> getSupportedInfraApplications(); + /** Returns a supported infrastructure with the given application id or empty if not found */ + Optional<InfraApplicationApi> getInfraApplication(ApplicationId applicationId); + /** Returns true if the DuperModel has registered the infrastructure application as active. */ boolean infraApplicationIsActive(ApplicationId applicationId); |