Remove MONITOR_TENANT_HOST_HEALTH flag

1 files changed, 11 insertions, 43 deletions

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 0c0a644165d..89bcda05074 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,7 +6,6 @@ import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.applicationmodel.ConfigId;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceStatusInfo;
-import com.yahoo.vespa.service.duper.ConfigServerApplication;
 import com.yahoo.vespa.service.duper.ControllerHostApplication;
 import com.yahoo.vespa.service.duper.DuperModelManager;
 import com.yahoo.vespa.service.duper.InfraApplication;
@@ -14,6 +13,7 @@ import com.yahoo.vespa.service.duper.ProxyHostApplication;
 import com.yahoo.vespa.service.duper.TestZoneApplication;
 import com.yahoo.vespa.service.duper.ZoneApplication;
 import com.yahoo.vespa.service.monitor.ConfigserverUtil;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
@@ -29,21 +29,13 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public class HealthMonitorManagerTest {
-    private final ConfigServerApplication configServerApplication = new ConfigServerApplication();
     private final DuperModelManager duperModel = mock(DuperModelManager.class);
     private final ApplicationHealthMonitor monitor = mock(ApplicationHealthMonitor.class);
     private final ApplicationHealthMonitorFactory monitorFactory = mock(ApplicationHealthMonitorFactory.class);
-    private HealthMonitorManager manager;
-
-    public void setUp(boolean monitorTenantHostHealth) {
-        manager = new HealthMonitorManager(duperModel, monitorTenantHostHealth, monitorFactory);
-        when(duperModel.getConfigServerApplication()).thenReturn(configServerApplication);
-        when(monitorFactory.create(any())).thenReturn(monitor);
-    }
+    private final HealthMonitorManager manager = new HealthMonitorManager(duperModel, monitorFactory);
 
     @Test
     public void addAndRemove() {
-        setUp(false);
         ApplicationInfo applicationInfo = ConfigserverUtil.makeExampleConfigServer();
         when(duperModel.isSupportedInfraApplication(applicationInfo.getApplicationId())).thenReturn(true);
 
@@ -57,29 +49,7 @@ public class HealthMonitorManagerTest {
     }
 
     @Test
-    public void withHostAdmin() {
-        setUp(false);
-        ServiceStatus status = manager.getStatus(
-                ZoneApplication.getApplicationId(),
-                ZoneApplication.getNodeAdminClusterId(),
-                ZoneApplication.getNodeAdminServiceType(),
-                new ConfigId("config-id-1")).serviceStatus();
-        assertEquals(ServiceStatus.UP, status);
-    }
-
-    @Test
-    public void verifyZoneApplicationIsNotMonitoredByDefault() {
-        verifyZoneApplicationIsMonitored(false, false);
-    }
-
-    @Test
     public void verifyZoneApplicationIsMonitored() {
-        verifyZoneApplicationIsMonitored(true, true);
-    }
-
-    private void verifyZoneApplicationIsMonitored(boolean monitorTenantHostHealth, boolean isMonitored) {
-        setUp(monitorTenantHostHealth);
-
         ApplicationInfo zoneApplicationInfo = new TestZoneApplication.Builder()
                 .addNodeAdminCluster("h1", "h2")
                 .addRoutingCluster("r1")
@@ -89,18 +59,13 @@ public class HealthMonitorManagerTest {
         verify(monitorFactory, times(0)).create(zoneApplicationInfo.getApplicationId());
         verify(monitor, times(0)).monitor(any());
         manager.applicationActivated(zoneApplicationInfo);
-        verify(monitorFactory, times(isMonitored ? 1 : 0)).create(zoneApplicationInfo.getApplicationId());
-        verify(monitor, times(isMonitored ? 1 : 0)).monitor(any());
+        verify(monitorFactory).create(zoneApplicationInfo.getApplicationId());
+        verify(monitor).monitor(any());
 
         when(monitor.getStatus(any(), any(), any(), any())).thenReturn(new ServiceStatusInfo(ServiceStatus.DOWN));
         verifyNodeAdminGetStatus(0);
-        if (isMonitored) {
-            assertEquals(ServiceStatus.DOWN, getNodeAdminStatus());
-            verifyNodeAdminGetStatus(1);
-        } else {
-            assertEquals(ServiceStatus.UP, getNodeAdminStatus());
-            verifyNodeAdminGetStatus(0);
-        }
+        assertEquals(ServiceStatus.DOWN, getNodeAdminStatus());
+        verifyNodeAdminGetStatus(1);
 
         verifyRoutingGetStatus(0);
         assertEquals(ServiceStatus.NOT_CHECKED, getRoutingStatus());
@@ -141,7 +106,6 @@ public class HealthMonitorManagerTest {
 
     @Test
     public void infrastructureApplication() {
-        setUp(false);
         ProxyHostApplication proxyHostApplication = new ProxyHostApplication();
         when(duperModel.isSupportedInfraApplication(proxyHostApplication.getApplicationId())).thenReturn(true);
         List<HostName> hostnames = Stream.of("proxyhost1", "proxyhost2").map(HostName::from).collect(Collectors.toList());
@@ -160,10 +124,14 @@ public class HealthMonitorManagerTest {
 
     @Test
     public void threadPoolSize() {
-        setUp(false);
         assertEquals(9, HealthMonitorManager.THREAD_POOL_SIZE);
     }
 
+    @Before
+    public void setup() {
+        when(monitorFactory.create(any())).thenReturn(monitor);
+    }
+
     private void assertStatus(ServiceStatus expected, int verifyTimes, InfraApplication infraApplication, String hostname) {
         ServiceStatus actual = manager.getStatus(
                 infraApplication.getApplicationId(),