Simplify infrastructure applications

5 files changed, 41 insertions, 38 deletions

diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/ApplicationHealthMonitorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/ApplicationHealthMonitorTest.java
index 078f34b84d1..0dfca12099e 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/ApplicationHealthMonitorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/ApplicationHealthMonitorTest.java
@@ -1,6 +1,7 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.service.health;
 
+import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.service.duper.ConfigServerApplication;
 import com.yahoo.vespa.service.monitor.ConfigserverUtil;
@@ -16,6 +17,8 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 public class ApplicationHealthMonitorTest {
+    private final ConfigServerApplication configServerApplication = new ConfigServerApplication();
+
     @Test
     public void sanityCheck() {
         MonitorFactory monitorFactory = new MonitorFactory();
@@ -36,28 +39,17 @@ public class ApplicationHealthMonitorTest {
                 ConfigserverUtil.makeExampleConfigServer(),
                 monitorFactory);
 
-        ConfigServerApplication configServerApplication = new ConfigServerApplication();
-
-        ServiceStatus status1 = applicationMonitor.getStatus(
-                ConfigServerApplication.CONFIG_SERVER_APPLICATION.getApplicationId(),
-                ConfigServerApplication.CLUSTER_ID,
-                ConfigServerApplication.SERVICE_TYPE,
-                ConfigServerApplication.configIdFrom(0));
-        assertEquals(ServiceStatus.UP, status1);
-
-        ServiceStatus status2 = applicationMonitor.getStatus(
-                ConfigServerApplication.CONFIG_SERVER_APPLICATION.getApplicationId(),
-                ConfigServerApplication.CLUSTER_ID,
-                ConfigServerApplication.SERVICE_TYPE,
-                ConfigServerApplication.configIdFrom(1));
-        assertEquals(ServiceStatus.DOWN, status2);
-
-        ServiceStatus status3 = applicationMonitor.getStatus(
-                ConfigServerApplication.CONFIG_SERVER_APPLICATION.getApplicationId(),
-                ConfigServerApplication.CLUSTER_ID,
-                ConfigServerApplication.SERVICE_TYPE,
-                ConfigServerApplication.configIdFrom(2));
-        assertEquals(ServiceStatus.NOT_CHECKED, status3);
+        assertEquals(ServiceStatus.UP, getStatus(applicationMonitor, "cfg1"));
+        assertEquals(ServiceStatus.DOWN, getStatus(applicationMonitor, "cfg2"));
+        assertEquals(ServiceStatus.NOT_CHECKED, getStatus(applicationMonitor, "cfg3"));
+    }
+
+    private ServiceStatus getStatus(ApplicationHealthMonitor monitor, String hostname) {
+        return monitor.getStatus(
+                configServerApplication.getApplicationId(),
+                configServerApplication.getClusterId(),
+                configServerApplication.getServiceType(),
+                configServerApplication.configIdFor(HostName.from(hostname)));
     }
 
     private static class MonitorFactory implements Function<HealthEndpoint, HealthMonitor> {
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java
index 0b9d7e123b5..5195bf218b6 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java
@@ -6,16 +6,29 @@ import com.yahoo.vespa.applicationmodel.ClusterId;
 import com.yahoo.vespa.applicationmodel.ConfigId;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceType;
+import com.yahoo.vespa.service.duper.ConfigServerApplication;
+import com.yahoo.vespa.service.duper.DuperModelManager;
 import com.yahoo.vespa.service.duper.ZoneApplication;
 import com.yahoo.vespa.service.monitor.ConfigserverUtil;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class HealthMonitorManagerTest {
+    private final ConfigServerApplication configServerApplication = new ConfigServerApplication();
+    private final DuperModelManager duperModel = mock(DuperModelManager.class);
+    private final HealthMonitorManager manager = new HealthMonitorManager(duperModel);
+
+    @Before
+    public void setUp() {
+        when(duperModel.getConfigServerApplication()).thenReturn(configServerApplication);
+    }
+
     @Test
     public void addRemove() {
-        HealthMonitorManager manager = new HealthMonitorManager();
         ApplicationInfo applicationInfo = ConfigserverUtil.makeExampleConfigServer();
         manager.applicationActivated(applicationInfo);
         manager.applicationRemoved(applicationInfo.getApplicationId());
@@ -23,7 +36,6 @@ public class HealthMonitorManagerTest {
 
     @Test
     public void withHostAdmin() {
-        HealthMonitorManager manager = new HealthMonitorManager();
         ServiceStatus status = manager.getStatus(
                 ZoneApplication.ZONE_APPLICATION_ID,
                 ClusterId.NODE_ADMIN,
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java
index a59206d14e2..bf3f7017b01 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java
@@ -6,16 +6,15 @@ import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
-import com.yahoo.vespa.service.monitor.ServiceStatusProvider;
-import com.yahoo.vespa.service.monitor.ConfigserverUtil;
 import com.yahoo.vespa.service.duper.ConfigServerApplication;
+import com.yahoo.vespa.service.monitor.ConfigserverUtil;
+import com.yahoo.vespa.service.monitor.ServiceStatusProvider;
 import org.junit.Test;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.yahoo.vespa.service.duper.ConfigServerApplication.CONFIG_SERVER_APPLICATION;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
@@ -30,6 +29,7 @@ public class ApplicationInstanceGeneratorTest {
             configServer1,
             configServer2,
             configServer3).collect(Collectors.toList());
+    private static final ConfigServerApplication configServerApplication = new ConfigServerApplication();
 
     private final ServiceStatusProvider statusProvider = mock(ServiceStatusProvider.class);
 
@@ -43,24 +43,24 @@ public class ApplicationInstanceGeneratorTest {
                 configServer2,
                 configServer3);
         Zone zone = mock(Zone.class);
-        ApplicationInfo configServer = CONFIG_SERVER_APPLICATION.makeApplicationInfoFromConfig(config);
+        ApplicationInfo configServer = configServerApplication.makeApplicationInfoFromConfig(config);
         ApplicationInstance applicationInstance = new ApplicationInstanceGenerator(configServer, zone)
                 .makeApplicationInstance(statusProvider);
 
         assertEquals(
-                ConfigServerApplication.APPLICATION_INSTANCE_ID,
+                configServerApplication.getApplicationInstanceId(),
                 applicationInstance.applicationInstanceId());
         assertEquals(
-                ConfigServerApplication.TENANT_ID,
+                configServerApplication.getTenantId(),
                 applicationInstance.tenantId());
 
         assertEquals(
-                ConfigServerApplication.TENANT_ID.toString() +
-                        ":" + ConfigServerApplication.APPLICATION_INSTANCE_ID,
+                configServerApplication.getTenantId().toString() +
+                        ":" + configServerApplication.getApplicationInstanceId(),
                 applicationInstance.reference().toString());
 
         assertEquals(
-                ConfigServerApplication.CLUSTER_ID,
+                configServerApplication.getClusterId(),
                 applicationInstance.serviceClusters().iterator().next().clusterId());
 
         assertEquals(
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ModelGeneratorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ModelGeneratorTest.java
index bcc136f80e3..30a49835f03 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ModelGeneratorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ModelGeneratorTest.java
@@ -33,6 +33,7 @@ public class ModelGeneratorTest {
     private final String REGION = "us-west-1";
     private final String HOSTNAME = "hostname";
     private final int PORT = 2;
+    private final ConfigServerApplication configServerApplication = new ConfigServerApplication();
 
     @Test
     public void toApplicationModel() throws Exception {
@@ -63,8 +64,7 @@ public class ModelGeneratorTest {
         ApplicationInstance applicationInstance1 = iterator.next().getValue();
         ApplicationInstance applicationInstance2 = iterator.next().getValue();
 
-        if (applicationInstance1.applicationInstanceId().equals(
-                ConfigServerApplication.APPLICATION_INSTANCE_ID)) {
+        if (applicationInstance1.applicationInstanceId().equals(configServerApplication.getApplicationInstanceId())) {
             verifyConfigServerApplication(applicationInstance1);
             verifyOtherApplication(applicationInstance2);
         } else {
@@ -108,7 +108,6 @@ public class ModelGeneratorTest {
 
     private void verifyConfigServerApplication(
             ApplicationInstance applicationInstance) {
-        assertEquals(ConfigServerApplication.APPLICATION_INSTANCE_ID,
-                applicationInstance.applicationInstanceId());
+        assertEquals(configServerApplication.getApplicationInstanceId(), applicationInstance.applicationInstanceId());
     }
 }
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java
index c334fad2334..7f817a0f1e6 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java
@@ -33,7 +33,7 @@ public class ConfigserverUtil {
             String configServerHostname1,
             String configServerHostname2,
             String configServerHostname3) {
-        return ConfigServerApplication.CONFIG_SERVER_APPLICATION.makeApplicationInfoFromConfig(create(
+        return new ConfigServerApplication().makeApplicationInfoFromConfig(create(
                 true,
                 true,
                 configServerHostname1,