diff options
Diffstat (limited to 'controller-api')
4 files changed, 2 insertions, 42 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java index 7265273d0d0..849912ef581 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java @@ -6,7 +6,6 @@ import com.yahoo.config.provision.HostName; import com.yahoo.vespa.hosted.controller.api.integration.routing.RotationStatus; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; -import java.util.Collections; import java.util.Map; /** @@ -20,14 +19,11 @@ public interface MetricsService { DeploymentMetrics getDeploymentMetrics(ApplicationId application, ZoneId zone); - // TODO: Remove default once implementation catches up /** * Get status for a global rotation * @param rotationName The fully qualified domain name of the rotation */ - default Map<HostName, RotationStatus> getRotationStatus(String rotationName) { - return Collections.emptyMap(); - } + Map<HostName, RotationStatus> getRotationStatus(String rotationName); Map<String, SystemMetrics> getSystemMetrics(ApplicationId application, ZoneId zone); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java index a238facc983..713fd7e273c 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java @@ -25,6 +25,7 @@ public enum JobType { productionEuWest1 ("production-eu-west-1" , ZoneId.from("prod" , "eu-west-1") , null ), productionAwsUsEast1a ("production-aws-us-east-1a" , ZoneId.from("prod" , "aws-us-east-1a") , null ), productionAwsUsWest1b ("production-aws-us-west-1b" , ZoneId.from("prod" , "aws-us-west-1b") , null ), + productionAwsUsEast1b ("production-aws-us-east-1b" , ZoneId.from("prod" , "aws-us-east-1b") , null ), productionCdAwsUsEast1a("production-cd-aws-us-east-1a", null , ZoneId.from("prod" , "cd-aws-us-east-1a")), productionCdUsCentral1 ("production-cd-us-central-1" , null , ZoneId.from("prod" , "cd-us-central-1") ), productionCdUsCentral2 ("production-cd-us-central-2" , null , ZoneId.from("prod" , "cd-us-central-2") ); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java deleted file mode 100644 index 5a5f775c013..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.integration.routing; - -import java.util.Map; - -/** - * A global routing service. - * - * @author mpolden - */ -// TODO: Remove once DeploymentMetricsMaintainer starts providing rotation status -public interface GlobalRoutingService { - - /** Returns the health status for each endpoint behind the given rotation name */ - Map<String, RotationStatus> getHealthStatus(String rotationName); - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/MemoryGlobalRoutingService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/MemoryGlobalRoutingService.java deleted file mode 100644 index 9f1ac1b1f0b..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/MemoryGlobalRoutingService.java +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.integration.routing; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -/** - * @author bratseth - */ -public class MemoryGlobalRoutingService implements GlobalRoutingService { - - @Override - public Map<String, RotationStatus> getHealthStatus(String rotationName) { - HashMap<String, RotationStatus> map = new HashMap<>(); - map.put("prod.us-west-1", RotationStatus.IN); - return Collections.unmodifiableMap(map); - } - -} |