diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-06-04 11:23:20 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-06-04 11:23:20 +0200 |
| commit | 75b6a57562d97854cb48498820cae0c9011dc2f5 (patch) | |
| tree | b86894e5ec24f705409f9bcda04b9f234e841f4d /orchestrator | |
| parent | dd359e0143899abbcfeef5922985c936ff24ed73 (diff) | |
Comment zone-app specific code that should be removed after the migration
Diffstat (limited to 'orchestrator')
3 files changed, 3 insertions, 1 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java index 71865753cd8..db9fe76dc62 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java @@ -35,6 +35,7 @@ public class VespaModelUtil { public static final ApplicationId TENANT_HOST_APPLICATION_ID = ApplicationId.from("hosted-vespa", "tenant-host", "default"); + // TODO: Remove after removing tenant hosts from zone-app public static final ApplicationId ZONE_APPLICATION_ID = ApplicationId.from("hosted-vespa", "routing", "default"); public static final ClusterId ADMIN_CLUSTER_ID = new ClusterId("admin"); diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java index e31e015e2c8..7190473dd41 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java @@ -84,6 +84,7 @@ public class HostedVespaClusterPolicy implements ClusterPolicy { return ConcurrentSuspensionLimitForCluster.TWENTY_PERCENT; } + // TODO: Remove after removing tenant hosts from zone-app if (clusterApi.getApplication().applicationId().equals(VespaModelUtil.ZONE_APPLICATION_ID) && clusterApi.clusterId().equals(VespaModelUtil.NODE_ADMIN_CLUSTER_ID)) { return ConcurrentSuspensionLimitForCluster.TWENTY_PERCENT; diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java index 4cf39671271..6fc826c1b5f 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java @@ -52,7 +52,7 @@ public class HostedVespaClusterPolicyTest { policy.getConcurrentSuspensionLimit(clusterApi)); } - @Test + @Test // TODO: Remove after removing tenant hosts from zone-app public void testNodeAdminSuspensionLimit() { when(applicationApi.applicationId()).thenReturn(VespaModelUtil.ZONE_APPLICATION_ID); when(clusterApi.clusterId()).thenReturn(VespaModelUtil.NODE_ADMIN_CLUSTER_ID); |