Rename dimension APPLICATION_ID -> INSTANCE_ID

7 files changed, 8 insertions, 8 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
index 8638087c5cd..eb290d9ec2a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
@@ -59,7 +59,7 @@ public class AutoscalingMaintainer extends NodeRepositoryMaintainer {
         int failures = 0;
         outer:
         for (var applicationNodes : activeNodesByApplication().entrySet()) {
-            boolean enabled = enabledFlag.with(FetchVector.Dimension.APPLICATION_ID,
+            boolean enabled = enabledFlag.with(FetchVector.Dimension.INSTANCE_ID,
                                                applicationNodes.getKey().serializedForm()).value();
             if (!enabled) continue;
             for (var clusterNodes : nodesByCluster(applicationNodes.getValue()).entrySet()) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java
index 14693c75436..9cbf1778b3b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java
@@ -58,7 +58,7 @@ public class PeriodicApplicationMaintainer extends ApplicationMaintainer {
 
     private boolean shouldMaintain(ApplicationId id) {
         BooleanFlag skipMaintenanceDeployment = PermanentFlags.SKIP_MAINTENANCE_DEPLOYMENT.bindTo(flagSource)
-                .with(FetchVector.Dimension.APPLICATION_ID, id.serializedForm());
+                .with(FetchVector.Dimension.INSTANCE_ID, id.serializedForm());
         return ! skipMaintenanceDeployment.value();
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
index 4236f78336b..e5599ac3d18 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
@@ -18,7 +18,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import static com.yahoo.config.provision.NodeResources.Architecture;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID;
+import static com.yahoo.vespa.flags.FetchVector.Dimension.INSTANCE_ID;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -146,7 +146,7 @@ public class CapacityPolicies {
     }
 
     private Architecture adminClusterArchitecture(ApplicationId instance) {
-        return Architecture.valueOf(adminClusterNodeArchitecture.with(APPLICATION_ID, instance.serializedForm()).value());
+        return Architecture.valueOf(adminClusterNodeArchitecture.with(INSTANCE_ID, instance.serializedForm()).value());
     }
 
     /** Returns the resources for the newest version not newer than that requested in the cluster spec. */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
index c414c70f315..22909122079 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
@@ -273,7 +273,7 @@ public class LoadBalancerProvisioner {
                                                              LoadBalancer currentLoadBalancer,
                                                              ZoneEndpoint zoneEndpoint,
                                                              CloudAccount cloudAccount) {
-        boolean shouldDeactivateRouting = deactivateRouting.with(FetchVector.Dimension.APPLICATION_ID,
+        boolean shouldDeactivateRouting = deactivateRouting.with(FetchVector.Dimension.INSTANCE_ID,
                                                                  id.application().serializedForm())
                                                            .value();
         Set<Real> reals = shouldDeactivateRouting ? Set.of() : realsOf(nodes, cloudAccount);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
index b289a965567..ca170d2af6b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
@@ -94,7 +94,7 @@ class NodeAllocation {
         this.nextIndex = nextIndex;
         this.nodeRepository = nodeRepository;
         this.requiredHostFlavor = Optional.of(PermanentFlags.HOST_FLAVOR.bindTo(nodeRepository.flagSource())
-                                                                        .with(FetchVector.Dimension.APPLICATION_ID, application.serializedForm())
+                                                                        .with(FetchVector.Dimension.INSTANCE_ID, application.serializedForm())
                                                                         .with(FetchVector.Dimension.CLUSTER_TYPE, cluster.type().name())
                                                                         .with(FetchVector.Dimension.CLUSTER_ID, cluster.id().value())
                                                                         .value())
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
index 06ab9eb1a10..ab222c45252 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
@@ -88,7 +88,7 @@ public class NodeResourceLimits {
         if (cluster.type() == ClusterSpec.Type.admin) return 1;
         if (!exclusive) return 4;
         return minExclusiveAdvertisedMemoryGbFlag
-                .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm())
+                .with(FetchVector.Dimension.INSTANCE_ID, applicationId.serializedForm())
                 .with(FetchVector.Dimension.CLUSTER_ID, cluster.id().value())
                 .with(FetchVector.Dimension.CLUSTER_TYPE, cluster.type().name())
                 .value();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
index 2b908efde94..a8f526544d7 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -201,7 +201,7 @@ class NodesResponse extends SlimeJsonResponse {
                 .with(FetchVector.Dimension.HOSTNAME, node.hostname())
                 .with(FetchVector.Dimension.NODE_TYPE, node.type().name())
                 .with(FetchVector.Dimension.TENANT_ID, allocation.owner().tenant().value())
-                .with(FetchVector.Dimension.APPLICATION_ID, allocation.owner().serializedForm())
+                .with(FetchVector.Dimension.INSTANCE_ID, allocation.owner().serializedForm())
                 .with(FetchVector.Dimension.CLUSTER_TYPE, allocation.membership().cluster().type().name())
                 .with(FetchVector.Dimension.CLUSTER_ID, allocation.membership().cluster().id().value())
                 .with(FetchVector.Dimension.VESPA_VERSION, allocation.membership().cluster().vespaVersion().toFullString())