Merge pull request #17210 from vespa-engine/mpolden/cleanup

Controller cleanup

18 files changed, 48 insertions, 66 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/AlreadyExistsException.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/AlreadyExistsException.java
deleted file mode 100644
index ffe7cb6ef67..00000000000
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/AlreadyExistsException.java
+++ /dev/null
@@ -1,26 +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;
-
-import com.yahoo.vespa.hosted.controller.api.identifiers.Identifier;
-
-/**
- * @author Tony Vaagenes
- */
-public class AlreadyExistsException extends IllegalArgumentException {
-
-    /**
-     * Example message: Tenant 'myId' already exists.
-     *
-     * @param capitalizedType e.g. Tenant, Application
-     * @param id The id of the entity that didn't exist.
-     *
-     */
-    public AlreadyExistsException(String capitalizedType, String id) {
-        super(String.format("%s '%s' already exists", capitalizedType, id));
-    }
-
-    public AlreadyExistsException(Identifier identifier) {
-        this(identifier.capitalizedType(), identifier.id());
-    }
-
-}
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 8de50aa348a..69d723edbe8 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -21,7 +21,7 @@ import com.yahoo.vespa.flags.FetchVector;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.flags.StringFlag;
-import com.yahoo.vespa.hosted.controller.api.ActivateResult;
+import com.yahoo.vespa.hosted.controller.application.ActivateResult;
 import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeploymentData;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.InstanceId;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
index fdd0e02e2ec..fdcadb6301e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.flags.FetchVector;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId;
-import com.yahoo.vespa.hosted.controller.athenz.impl.AthenzFacade;
+import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 import com.yahoo.vespa.hosted.controller.concurrent.Once;
 import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
 import com.yahoo.vespa.hosted.controller.security.AccessControl;
@@ -164,7 +164,7 @@ public class TenantController {
     }
 
     private void requireNonExistent(TenantName name) {
-        if ("hosted-vespa".equals(name.value())
+        if (SystemApplication.TENANT.equals(name)
             || get(name).isPresent()
             // Underscores are allowed in existing tenant names, but tenants with - and _ cannot co-exist. E.g.
             // my-tenant cannot be created if my_tenant exists.
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/package-info.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/package-info.java
deleted file mode 100644
index 4b405f55e10..00000000000
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * @author Tony Vaagenes
- */
-@ExportPackage
-package com.yahoo.vespa.hosted.controller.api;
-
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/ActivateResult.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ActivateResult.java
index 5379a08afc0..20400be0d1f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/ActivateResult.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ActivateResult.java
@@ -1,5 +1,5 @@
 // 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;
+package com.yahoo.vespa.hosted.controller.application;
 
 import com.yahoo.vespa.hosted.controller.api.identifiers.RevisionId;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.PrepareResponse;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
index 8d082222721..33eafecf60a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
@@ -40,7 +40,6 @@ public final class Change {
             throw new IllegalArgumentException("Application version to deploy must be a known version");
         }
         this.pinned = pinned;
-
     }
 
     public Change withoutPlatform() {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java
index b742c45bf09..cfc9393efe2 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java
@@ -3,7 +3,9 @@ package com.yahoo.vespa.hosted.controller.application;
 
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.NodeType;
+import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
@@ -23,19 +25,22 @@ import java.util.Optional;
  */
 public enum SystemApplication {
 
-    controllerHost(ApplicationId.from("hosted-vespa", "controller-host", "default"), NodeType.controllerhost),
-    configServerHost(ApplicationId.from("hosted-vespa", "configserver-host", "default"), NodeType.confighost),
-    configServer(ApplicationId.from("hosted-vespa", "zone-config-servers", "default"), NodeType.config),
-    proxyHost(ApplicationId.from("hosted-vespa", "proxy-host", "default"), NodeType.proxyhost),
-    proxy(ApplicationId.from("hosted-vespa", "routing", "default"), NodeType.proxy, proxyHost, configServer),
-    tenantHost(ApplicationId.from("hosted-vespa", "tenant-host", "default"), NodeType.host);
+    controllerHost("controller-host", NodeType.controllerhost),
+    configServerHost("configserver-host", NodeType.confighost),
+    configServer("zone-config-servers", NodeType.config),
+    proxyHost("proxy-host", NodeType.proxyhost),
+    proxy( "routing", NodeType.proxy, proxyHost, configServer),
+    tenantHost("tenant-host", NodeType.host);
+
+    /** The tenant owning all system applications */
+    public static final TenantName TENANT = TenantName.from(Constants.TENANT_NAME);
 
     private final ApplicationId id;
     private final NodeType nodeType;
     private final List<SystemApplication> dependencies;
 
-    SystemApplication(ApplicationId id, NodeType nodeType, SystemApplication... dependencies) {
-        this.id = id;
+    SystemApplication(String application, NodeType nodeType, SystemApplication... dependencies) {
+        this.id = ApplicationId.from(Constants.TENANT_NAME, application, InstanceName.defaultName().value());
         this.nodeType = nodeType;
         this.dependencies = List.of(dependencies);
     }
@@ -103,4 +108,8 @@ public enum SystemApplication {
         return String.format("system application %s of type %s", id, nodeType);
     }
 
+    private static class Constants {
+        private static final String TENANT_NAME = "hosted-vespa";
+    }
+
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index f2df1cce15b..dd94c025444 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -25,7 +25,7 @@ import com.yahoo.security.X509CertificateUtils;
 import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.Instance;
-import com.yahoo.vespa.hosted.controller.api.ActivateResult;
+import com.yahoo.vespa.hosted.controller.application.ActivateResult;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 import com.yahoo.vespa.hosted.controller.api.integration.LogEntry;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/LockedStep.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/LockedStep.java
index d1d3e6238fd..966c9a2dbc3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/LockedStep.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/LockedStep.java
@@ -3,6 +3,9 @@ package com.yahoo.vespa.hosted.controller.deployment;
 
 import com.yahoo.vespa.curator.Lock;
 
+/**
+ * @author jonmv
+ */
 public class LockedStep {
 
     private final Step step;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java
index 5dce4d7b344..6b8f2c6b822 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java
@@ -8,6 +8,7 @@ import com.yahoo.vespa.hosted.controller.ApplicationController;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveService;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository;
+import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 
 import java.net.URI;
 import java.time.Duration;
@@ -23,7 +24,7 @@ import java.util.Set;
  */
 public class ArchiveUriUpdater extends ControllerMaintainer {
 
-    private static final Set<TenantName> INFRASTRUCTURE_TENANTS = Set.of(TenantName.from("hosted-vespa"));
+    private static final Set<TenantName> INFRASTRUCTURE_TENANTS = Set.of(SystemApplication.TENANT);
 
     private final ApplicationController applications;
     private final NodeRepository nodeRepository;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirer.java
index 0f976458257..ff5fc4d2051 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirer.java
@@ -38,7 +38,7 @@ public class ContainerImageExpirer extends ControllerMaintainer {
         Instant now = controller().clock().instant();
         VersionStatus versionStatus = controller().readVersionStatus();
         List<ContainerImage> imagesToExpire = controller().serviceRegistry().containerRegistry().list().stream()
-                                                          .filter(image -> canExpire(image, now, versionStatus))
+                                                          .filter(image -> isExpired(image, now, versionStatus))
                                                           .collect(Collectors.toList());
         if (!imagesToExpire.isEmpty()) {
             log.log(Level.INFO, "Expiring " + imagesToExpire.size() + " container images: " + imagesToExpire);
@@ -47,8 +47,8 @@ public class ContainerImageExpirer extends ControllerMaintainer {
         return true;
     }
 
-    /** Returns whether given image can be expired */
-    private boolean canExpire(ContainerImage image, Instant now, VersionStatus versionStatus) {
+    /** Returns whether given image is expired */
+    private boolean isExpired(ContainerImage image, Instant now, VersionStatus versionStatus) {
         List<VespaVersion> versions = versionStatus.versions();
         if (versions.isEmpty()) return false;
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
index 8de6bdbb99c..fd375c80218 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
@@ -11,6 +11,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository;
 import com.yahoo.vespa.hosted.controller.api.integration.resource.MeteringClient;
 import com.yahoo.vespa.hosted.controller.api.integration.resource.ResourceSnapshot;
+import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
 import com.yahoo.yolean.Exceptions;
 
@@ -100,7 +101,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
 
     private Collection<ResourceSnapshot> createResourceSnapshotsFromNodes(ZoneId zoneId, List<Node> nodes) {
         return nodes.stream()
-                .filter(this::unlessNodeOwnerIsHostedVespa)
+                .filter(this::unlessNodeOwnerIsSystemApplication)
                 .filter(this::isNodeStateMeterable)
                 .filter(this::isNodeTypeMeterable)
                 .collect(Collectors.groupingBy(node ->
@@ -113,10 +114,10 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
                                 )).values();
     }
 
-    private boolean unlessNodeOwnerIsHostedVespa(Node node) {
+    private boolean unlessNodeOwnerIsSystemApplication(Node node) {
         return node.owner()
-                .map(owner -> !owner.tenant().value().equals("hosted-vespa"))
-                .orElse(false);
+                   .map(owner -> !owner.tenant().equals(SystemApplication.TENANT))
+                   .orElse(false);
     }
 
     /**
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
index 4cc4ee0386c..5d92166d758 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
@@ -8,6 +8,7 @@ import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.identifiers.Property;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository;
 import com.yahoo.vespa.hosted.controller.api.integration.resource.ResourceAllocation;
+import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 import com.yahoo.vespa.hosted.controller.tenant.AthenzTenant;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 
@@ -48,7 +49,7 @@ public class CostCalculator {
         var nodes = controller.zoneRegistry().zones()
                               .reachable().in(Environment.prod).ofCloud(cloudName).zones().stream()
                               .flatMap(zone -> uncheck(() -> nodeRepository.list(zone.getId()).stream()))
-                              .filter(node -> node.owner().isPresent() && !node.owner().get().tenant().value().equals("hosted-vespa"))
+                              .filter(node -> node.owner().isPresent() && !node.owner().get().tenant().equals(SystemApplication.TENANT))
                               .collect(Collectors.toList());
         var totalAllocation = ResourceAllocation.ZERO;
         for (var node : nodes) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index a7b872630e7..d082cf6fea9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -41,7 +41,7 @@ import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.Instance;
 import com.yahoo.vespa.hosted.controller.LockedTenant;
 import com.yahoo.vespa.hosted.controller.NotExistsException;
-import com.yahoo.vespa.hosted.controller.api.ActivateResult;
+import com.yahoo.vespa.hosted.controller.application.ActivateResult;
 import com.yahoo.vespa.hosted.controller.api.application.v4.EnvironmentResource;
 import com.yahoo.vespa.hosted.controller.api.application.v4.model.EndpointStatus;
 import com.yahoo.vespa.hosted.controller.api.application.v4.model.ProtonMetrics;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
index f87c6e2d11c..a0fecbdf9e1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java
@@ -73,8 +73,8 @@ public class RoutingPolicy {
     public Endpoint endpointIn(SystemName system, RoutingMethod routingMethod, ZoneRegistry zoneRegistry) {
         Optional<Endpoint> infraEndpoint = SystemApplication.matching(id.owner())
                                                             .flatMap(app -> app.endpointIn(id.zone(), zoneRegistry));
-        if (infraEndpoint.isPresent()) return infraEndpoint.get();
-        return endpoint(routingMethod).target(id.cluster(), id.zone()).in(system);
+        return infraEndpoint.orElseGet(() -> endpoint(routingMethod).target(id.cluster(), id.zone())
+                                                                    .in(system));
     }
 
     /** Returns the region endpoint of this */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
index 8fd5f07b9ea..69808a987fc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
@@ -75,8 +75,8 @@ public class OsVersionStatus {
                     var nodeVersion = new NodeVersion(node.hostname(), zone.getVirtualId(), node.currentOsVersion(),
                                                       targetOsVersion, suspendedAt);
                     var osVersion = new OsVersion(nodeVersion.currentVersion(), zone.getCloudName());
-                    osVersions.putIfAbsent(osVersion, new ArrayList<>());
-                    osVersions.get(osVersion).add(nodeVersion);
+                    osVersions.computeIfAbsent(osVersion, (k) -> new ArrayList<>())
+                              .add(nodeVersion);
                 }
             }
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java
index a9666cf9113..379331265e5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java
@@ -9,6 +9,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.archive.MockArchiveServ
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
+import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentContext;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
 import org.junit.Test;
@@ -33,7 +34,7 @@ public class ArchiveUriUpdaterTest {
 
         var tenant1 = TenantName.from("tenant1");
         var tenant2 = TenantName.from("tenant2");
-        var tenantInfra = TenantName.from("hosted-vespa");
+        var tenantInfra = SystemApplication.TENANT;
         var application = tester.newDeploymentContext(tenant1.value(), "app1", "instance1");
         ZoneId zone = ZoneId.from("prod", "ap-northeast-1");
 
@@ -77,4 +78,4 @@ public class ArchiveUriUpdaterTest {
     private void deploy(DeploymentContext application, ZoneId zone) {
         application.runJob(JobType.from(SystemName.main, zone).orElseThrow(), new ApplicationPackage(new byte[0]), Version.fromString("7.1"));
     }
-}
\ No newline at end of file
+}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
index ad8d0050c73..814dc2a3f50 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
@@ -8,6 +8,7 @@ import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.api.integration.aws.MockResourceTagger;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node;
+import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 import com.yahoo.vespa.hosted.controller.integration.ZoneApiMock;
 import org.junit.Test;
 
@@ -52,7 +53,7 @@ public class ResourceTagMaintainerTest {
         var hostA = new Node.Builder()
                 .hostname(HostName.from("parentHostA." + zone.value()))
                 .type(NodeType.host)
-                .owner(ApplicationId.from("hosted-vespa", "tenant-host", "default"))
+                .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default"))
                 .exclusiveTo(ApplicationId.from("t1", "a1", "i1"))
                 .build();
         var nodeA = new Node.Builder()
@@ -64,7 +65,7 @@ public class ResourceTagMaintainerTest {
         var hostB = new Node.Builder()
                 .hostname(HostName.from("parentHostB." + zone.value()))
                 .type(NodeType.host)
-                .owner(ApplicationId.from("hosted-vespa", "tenant-host", "default"))
+                .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default"))
                 .build();
         tester.configServer().nodeRepository().setNodes(zone, List.of(hostA, nodeA, hostB));
     }