diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2019-11-15 16:06:40 +0100 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2019-11-15 16:06:40 +0100 |
commit | da978ae5a7ae163f33dd604831dded50cb1c6ee3 (patch) | |
tree | a5e2da86d1f6cf0b65aa748e911a9e1c68628fa9 /controller-api | |
parent | a078c9d8d365682639477c6d499a48fe12b56ecd (diff) |
Map hostname to applicationId
Diffstat (limited to 'controller-api')
2 files changed, 7 insertions, 7 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockResourceTagger.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockResourceTagger.java index 6992e813b10..0fd114095d7 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockResourceTagger.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockResourceTagger.java @@ -1,8 +1,8 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.aws; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostName; -import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.ZoneApi; import com.yahoo.config.provision.zone.ZoneId; @@ -14,15 +14,15 @@ import java.util.Map; */ public class MockResourceTagger implements ResourceTagger { - Map<ZoneId, Map<HostName, TenantName>> values = new HashMap<>(); + Map<ZoneId, Map<HostName, ApplicationId>> values = new HashMap<>(); @Override - public int tagResources(ZoneApi zone, Map<HostName, TenantName> tenantOfHosts) { + public int tagResources(ZoneApi zone, Map<HostName, ApplicationId> tenantOfHosts) { values.put(zone.getId(), tenantOfHosts); return 0; } - public Map<ZoneId, Map<HostName, TenantName>> getValues() { + public Map<ZoneId, Map<HostName, ApplicationId>> getValues() { return values; } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java index 46561ccf401..9d0e6481d38 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java @@ -1,8 +1,8 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.aws; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostName; -import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.ZoneApi; import java.util.Map; @@ -15,12 +15,12 @@ public interface ResourceTagger { /** * Returns number of tagged resources */ - int tagResources(ZoneApi zone, Map<HostName, TenantName> tenantOfHosts); + int tagResources(ZoneApi zone, Map<HostName, ApplicationId> tenantOfHosts); static ResourceTagger empty() { return new ResourceTagger() { @Override - public int tagResources(ZoneApi zone, Map<HostName, TenantName> tenantOfHosts) { + public int tagResources(ZoneApi zone, Map<HostName, ApplicationId> tenantOfHosts) { return 0; } }; |