From f5a85ee097a0f666b66285bc8fedb5665acd87c8 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Sat, 5 Jan 2019 19:54:29 +0100 Subject: Remove dependencies which are not available --- .../vespa/config/server/application/ConfigConvergenceChecker.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configserver') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java index 5f64ce12d2d..00f4d4be299 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java @@ -9,9 +9,7 @@ import com.yahoo.config.model.api.PortInfo; import com.yahoo.config.model.api.ServiceInfo; import com.yahoo.config.provision.ApplicationId; import com.yahoo.slime.Cursor; -import com.yahoo.vespa.applicationmodel.ClusterId; import com.yahoo.vespa.config.server.http.JSONResponse; -import com.yahoo.vespa.orchestrator.model.VespaModelUtil; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.proxy.WebResourceFactory; @@ -41,6 +39,8 @@ import java.util.stream.Collectors; */ public class ConfigConvergenceChecker extends AbstractComponent { + private static final ApplicationId routingApplicationId = ApplicationId.from("hosted-vespa", "routing", "default"); + private static final String nodeAdminName = "node-admin"; private static final String statePath = "/state/v1/"; private static final String configSubPath = "config"; private final static Set serviceTypesToCheck = new HashSet<>(Arrays.asList( @@ -174,9 +174,9 @@ public class ConfigConvergenceChecker extends AbstractComponent { } private static boolean isHostAdminService(ApplicationId id, ServiceInfo service) { - return VespaModelUtil.ZONE_APPLICATION_ID.equals(id) + return routingApplicationId.equals(id) && service.getProperty("clustername") - .map(ClusterId.NODE_ADMIN.s()::equals) + .map("node-admin"::equals) .orElse(false); } -- cgit v1.2.3