Tag EC2 instances with exclusiveTo value instead

2 files changed, 7 insertions, 5 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 0fd114095d7..a74a362330b 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
@@ -8,21 +8,22 @@ import com.yahoo.config.provision.zone.ZoneId;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @author olaa
  */
 public class MockResourceTagger implements ResourceTagger {
 
-    Map<ZoneId, Map<HostName, ApplicationId>> values = new HashMap<>();
+    Map<ZoneId, Map<HostName, Optional<ApplicationId>>> values = new HashMap<>();
 
     @Override
-    public int tagResources(ZoneApi zone, Map<HostName, ApplicationId> tenantOfHosts) {
-        values.put(zone.getId(), tenantOfHosts);
+    public int tagResources(ZoneApi zone, Map<HostName, Optional<ApplicationId>> ownerOfHosts) {
+        values.put(zone.getId(), ownerOfHosts);
         return 0;
     }
 
-    public Map<ZoneId, Map<HostName, ApplicationId>> getValues() {
+    public Map<ZoneId, Map<HostName, Optional<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 5b3cd18403b..61f8a57ac8b 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
@@ -6,6 +6,7 @@ import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.zone.ZoneApi;
 
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @author olaa
@@ -15,7 +16,7 @@ public interface ResourceTagger {
     /**
      * Returns number of tagged resources
      */
-    int tagResources(ZoneApi zone, Map<HostName, ApplicationId> tenantOfHosts);
+    int tagResources(ZoneApi zone, Map<HostName, Optional<ApplicationId>> ownerOfHosts);
 
     static ResourceTagger empty() {
         return (zone, tenantOfHosts) -> 0;