Metadata about /state/v1/health status

The service monitor uses /state/v1/health to monitor config servers and the
host admins (but not yet tenant host admins).

This commit adds some metadata about the status of a service:
 - The time the status was last checked
 - The time the status changed to the current

This can be used to e.g. make more intelligent decisions in the Orchestrator,
e.g. only allowing a service to suspend if it has been DOWN longer than X
seconds (to avoid spurious DOWN to break redundancy and uptime guarantees).

11 files changed, 57 insertions, 55 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 821f5282998..8861fa7db9f 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
@@ -4,6 +4,7 @@ package com.yahoo.vespa.service.health;
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
+import com.yahoo.vespa.applicationmodel.ServiceStatusInfo;
 import com.yahoo.vespa.service.duper.ConfigServerApplication;
 import com.yahoo.vespa.service.model.ServiceId;
 import com.yahoo.vespa.service.monitor.ConfigserverUtil;
@@ -47,9 +48,9 @@ public class ApplicationHealthMonitorTest {
         verify(endpoint1, times(1)).startMonitoring();
         verify(endpoint2, times(1)).startMonitoring();
 
-        when(monitor1.getStatus()).thenReturn(ServiceStatus.UP);
-        when(monitor2.getStatus()).thenReturn(ServiceStatus.DOWN);
-        when(monitor3.getStatus()).thenReturn(ServiceStatus.UP);
+        when(monitor1.getStatus()).thenReturn(new ServiceStatusInfo(ServiceStatus.UP));
+        when(monitor2.getStatus()).thenReturn(new ServiceStatusInfo(ServiceStatus.DOWN));
+        when(monitor3.getStatus()).thenReturn(new ServiceStatusInfo(ServiceStatus.UP));
 
         assertEquals(ServiceStatus.UP, getStatus(applicationMonitor, "cfg1"));
         assertEquals(ServiceStatus.DOWN, getStatus(applicationMonitor, "cfg2"));
@@ -94,6 +95,7 @@ public class ApplicationHealthMonitorTest {
                 configServerApplication.getApplicationId(),
                 configServerApplication.getClusterId(),
                 configServerApplication.getServiceType(),
-                configServerApplication.configIdFor(HostName.from(hostname)));
+                configServerApplication.configIdFor(HostName.from(hostname)))
+                .serviceStatus();
     }
 }
\ No newline at end of file
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 6e18bebf791..0c0a644165d 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
@@ -5,6 +5,7 @@ import com.yahoo.config.model.api.ApplicationInfo;
 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;
@@ -62,7 +63,7 @@ public class HealthMonitorManagerTest {
                 ZoneApplication.getApplicationId(),
                 ZoneApplication.getNodeAdminClusterId(),
                 ZoneApplication.getNodeAdminServiceType(),
-                new ConfigId("config-id-1"));
+                new ConfigId("config-id-1")).serviceStatus();
         assertEquals(ServiceStatus.UP, status);
     }
 
@@ -91,7 +92,7 @@ public class HealthMonitorManagerTest {
         verify(monitorFactory, times(isMonitored ? 1 : 0)).create(zoneApplicationInfo.getApplicationId());
         verify(monitor, times(isMonitored ? 1 : 0)).monitor(any());
 
-        when(monitor.getStatus(any(), any(), any(), any())).thenReturn(ServiceStatus.DOWN);
+        when(monitor.getStatus(any(), any(), any(), any())).thenReturn(new ServiceStatusInfo(ServiceStatus.DOWN));
         verifyNodeAdminGetStatus(0);
         if (isMonitored) {
             assertEquals(ServiceStatus.DOWN, getNodeAdminStatus());
@@ -127,7 +128,7 @@ public class HealthMonitorManagerTest {
                 ZoneApplication.getApplicationId(),
                 ZoneApplication.getNodeAdminClusterId(),
                 ZoneApplication.getNodeAdminServiceType(),
-                new ConfigId("foo"));
+                new ConfigId("foo")).serviceStatus();
     }
 
     private ServiceStatus getRoutingStatus() {
@@ -135,7 +136,7 @@ public class HealthMonitorManagerTest {
                 ZoneApplication.getApplicationId(),
                 ZoneApplication.getRoutingClusterId(),
                 ZoneApplication.getRoutingServiceType(),
-                new ConfigId("bar"));
+                new ConfigId("bar")).serviceStatus();
     }
 
     @Test
@@ -149,7 +150,7 @@ public class HealthMonitorManagerTest {
         manager.applicationActivated(proxyHostApplicationInfo);
         verify(monitorFactory, times(1)).create(proxyHostApplicationInfo.getApplicationId());
 
-        when(monitor.getStatus(any(), any(), any(), any())).thenReturn(ServiceStatus.UP);
+        when(monitor.getStatus(any(), any(), any(), any())).thenReturn(new ServiceStatusInfo(ServiceStatus.UP));
         assertStatus(ServiceStatus.UP, 1, proxyHostApplication, "proxyhost1");
 
         ControllerHostApplication controllerHostApplication = new ControllerHostApplication();
@@ -168,7 +169,7 @@ public class HealthMonitorManagerTest {
                 infraApplication.getApplicationId(),
                 infraApplication.getClusterId(),
                 infraApplication.getServiceType(),
-                infraApplication.configIdFor(HostName.from(hostname)));
+                infraApplication.configIdFor(HostName.from(hostname))).serviceStatus();
 
         assertEquals(expected, actual);
 
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java
index e38589b6f81..b6b88b0c0d3 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java
@@ -66,7 +66,7 @@ public class StateV1HealthModelTest {
         Cancellable cancellable = mock(Cancellable.class);
         when(executor.scheduleWithFixedDelay(any(), any())).thenReturn(cancellable);
         try (HealthMonitor healthMonitor = endpoint1.startMonitoring()) {
-            assertEquals(ServiceStatus.DOWN, healthMonitor.getStatus());
+            assertEquals(ServiceStatus.NOT_CHECKED, healthMonitor.getStatus().serviceStatus());
         }
     }
 
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthMonitorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthMonitorTest.java
index c892118990f..533e5173ccc 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthMonitorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthMonitorTest.java
@@ -16,20 +16,19 @@ public class StateV1HealthMonitorTest {
     @Test
     public void downThenUpThenDown() throws Exception {
         StateV1HealthClient client = mock(StateV1HealthClient.class);
-        when(client.get()).thenReturn(HealthInfo.empty());
 
         StateV1HealthUpdater updater = new StateV1HealthUpdater(client);
         RunletExecutor executor = new RunletExecutorImpl(2);
         try (StateV1HealthMonitor monitor = new StateV1HealthMonitor(updater, executor, Duration.ofMillis(10))) {
-            assertEquals(ServiceStatus.DOWN, monitor.getStatus());
+            assertEquals(ServiceStatus.NOT_CHECKED, monitor.getStatus().serviceStatus());
 
             when(client.get()).thenReturn(HealthInfo.fromHealthStatusCode(HealthInfo.UP_STATUS_CODE));
-            while (monitor.getStatus() != ServiceStatus.UP) {
+            while (monitor.getStatus().serviceStatus() != ServiceStatus.UP) {
                 try { Thread.sleep(2); } catch (InterruptedException ignored) { }
             }
 
             when(client.get()).thenReturn(HealthInfo.fromException(new IllegalStateException("foo")));
-            while (monitor.getStatus() != ServiceStatus.DOWN) {
+            while (monitor.getStatus().serviceStatus() != ServiceStatus.DOWN) {
                 try { Thread.sleep(2); } catch (InterruptedException ignored) { }
             }
         }
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthUpdaterTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthUpdaterTest.java
index e7b7a829dac..b8f108a480e 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthUpdaterTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthUpdaterTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.service.health;
 
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
+import com.yahoo.vespa.applicationmodel.ServiceStatusInfo;
 import org.apache.http.HttpEntity;
 import org.apache.http.StatusLine;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -15,7 +16,7 @@ import java.net.URL;
 import java.util.function.Function;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -31,7 +32,7 @@ public class StateV1HealthUpdaterTest {
 
     @Test
     public void successfulRequestResponse() throws IOException {
-        HealthInfo info = getHealthInfoFromJsonResponse("{\n" +
+        ServiceStatusInfo info = getServiceStatusInfoFromJsonResponse("{\n" +
                 "    \"metrics\": {\n" +
                 "        \"snapshot\": {\n" +
                 "            \"from\": 1.528789829249E9,\n" +
@@ -41,13 +42,13 @@ public class StateV1HealthUpdaterTest {
                 "    \"status\": {\"code\": \"up\"},\n" +
                 "    \"time\": 1528789889364\n" +
                 "}");
-        assertTrue(info.isHealthy());
-        assertEquals(ServiceStatus.UP, info.toServiceStatus());
+        assertEquals(ServiceStatus.UP, info.serviceStatus());
+        assertNull(info.errorOrNull());
     }
 
     @Test
     public void notUpResponse() throws IOException {
-        HealthInfo info = getHealthInfoFromJsonResponse("{\n" +
+        ServiceStatusInfo info = getServiceStatusInfoFromJsonResponse("{\n" +
                 "    \"metrics\": {\n" +
                 "        \"snapshot\": {\n" +
                 "            \"from\": 1.528789829249E9,\n" +
@@ -57,14 +58,13 @@ public class StateV1HealthUpdaterTest {
                 "    \"status\": {\"code\": \"initializing\"},\n" +
                 "    \"time\": 1528789889364\n" +
                 "}");
-        assertFalse(info.isHealthy());
-        assertEquals(ServiceStatus.DOWN, info.toServiceStatus());
-        assertEquals("Bad health status code 'initializing'", info.toString());
+        assertEquals(ServiceStatus.DOWN, info.serviceStatus());
+        assertEquals("Bad health status code 'initializing'", info.errorOrNull());
     }
 
     @Test
     public void noCodeInResponse() throws IOException {
-        HealthInfo info = getHealthInfoFromJsonResponse("{\n" +
+        ServiceStatusInfo info = getServiceStatusInfoFromJsonResponse("{\n" +
                 "    \"metrics\": {\n" +
                 "        \"snapshot\": {\n" +
                 "            \"from\": 1.528789829249E9,\n" +
@@ -74,14 +74,13 @@ public class StateV1HealthUpdaterTest {
                 "    \"status\": {\"foo\": \"bar\"},\n" +
                 "    \"time\": 1528789889364\n" +
                 "}");
-        assertFalse(info.isHealthy());
-        assertEquals(ServiceStatus.DOWN, info.toServiceStatus());
-        assertEquals("Bad health status code 'down'", info.toString());
+        assertEquals(ServiceStatus.DOWN, info.serviceStatus());
+        assertEquals("Bad health status code 'down'", info.errorOrNull());
     }
 
     @Test
     public void noStatusInResponse() throws IOException {
-        HealthInfo info = getHealthInfoFromJsonResponse("{\n" +
+        ServiceStatusInfo info = getServiceStatusInfoFromJsonResponse("{\n" +
                 "    \"metrics\": {\n" +
                 "        \"snapshot\": {\n" +
                 "            \"from\": 1.528789829249E9,\n" +
@@ -90,20 +89,18 @@ public class StateV1HealthUpdaterTest {
                 "    },\n" +
                 "    \"time\": 1528789889364\n" +
                 "}");
-        assertFalse(info.isHealthy());
-        assertEquals(ServiceStatus.DOWN, info.toServiceStatus());
-        assertEquals("Bad health status code 'down'", info.toString());
+        assertEquals(ServiceStatus.DOWN, info.serviceStatus());
+        assertEquals("Bad health status code 'down'", info.errorOrNull());
     }
 
     @Test
     public void badJson() throws IOException {
-        HealthInfo info = getHealthInfoFromJsonResponse("} foo bar");
-        assertFalse(info.isHealthy());
-        assertEquals(ServiceStatus.DOWN, info.toServiceStatus());
-        assertTrue(info.toString().startsWith("Exception: Unexpected close marker '}': "));
+        ServiceStatusInfo info = getServiceStatusInfoFromJsonResponse("} foo bar");
+        assertEquals(ServiceStatus.DOWN, info.serviceStatus());
+        assertTrue(info.errorOrNull().startsWith("Exception: Unexpected close marker '}': "));
     }
 
-    private HealthInfo getHealthInfoFromJsonResponse(String content)
+    private ServiceStatusInfo getServiceStatusInfoFromJsonResponse(String content)
             throws IOException {
         CloseableHttpClient client = mock(CloseableHttpClient.class);
 
@@ -121,7 +118,7 @@ public class StateV1HealthUpdaterTest {
         try (StateV1HealthUpdater updater = makeUpdater(client, entry -> content)) {
             when(httpEntity.getContentLength()).thenReturn((long) content.length());
             updater.run();
-            return updater.getLatestHealthInfo();
+            return updater.getServiceStatusInfo();
         }
     }
 
@@ -133,10 +130,9 @@ public class StateV1HealthUpdaterTest {
 
         try (StateV1HealthUpdater updater = makeUpdater(client, entry -> "")) {
             updater.run();
-            HealthInfo info = updater.getLatestHealthInfo();
-            assertFalse(info.isHealthy());
-            assertEquals(ServiceStatus.DOWN, info.toServiceStatus());
-            assertEquals("Exception: exception string", info.toString());
+            ServiceStatusInfo info = updater.getServiceStatusInfo();
+            assertEquals(ServiceStatus.DOWN, info.serviceStatus());
+            assertEquals("Exception: exception string", info.errorOrNull());
         }
     }
 
@@ -160,10 +156,9 @@ public class StateV1HealthUpdaterTest {
         try (HealthUpdater updater = makeUpdater(client, entry -> content)) {
             when(httpEntity.getContentLength()).thenReturn((long) content.length());
             updater.run();
-            HealthInfo info = updater.getLatestHealthInfo();
-            assertFalse(info.isHealthy());
-            assertEquals(ServiceStatus.DOWN, info.toServiceStatus());
-            assertEquals("Bad HTTP response status code 500", info.toString());
+            ServiceStatusInfo info = updater.getServiceStatusInfo();
+            assertEquals(ServiceStatus.DOWN, info.serviceStatus());
+            assertEquals("Bad HTTP response status code 500", info.errorOrNull());
         }
     }
 
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/manager/UnionMonitorManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/manager/UnionMonitorManagerTest.java
index b97fd6c64a5..5cfe70fae5f 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/manager/UnionMonitorManagerTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/manager/UnionMonitorManagerTest.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.service.manager;
 
 import com.yahoo.vespa.applicationmodel.ConfigId;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
+import com.yahoo.vespa.applicationmodel.ServiceStatusInfo;
 import com.yahoo.vespa.service.duper.ZoneApplication;
 import com.yahoo.vespa.service.health.HealthMonitorManager;
 import com.yahoo.vespa.service.slobrok.SlobrokMonitorManagerImpl;
@@ -34,12 +35,12 @@ public class UnionMonitorManagerTest {
     private void testWith(ServiceStatus healthStatus,
                           ServiceStatus slobrokStatus,
                           ServiceStatus expectedStatus) {
-        when(healthMonitorManager.getStatus(any(), any(), any(), any())).thenReturn(healthStatus);
-        when(slobrokMonitorManager.getStatus(any(), any(), any(), any())).thenReturn(slobrokStatus);
+        when(healthMonitorManager.getStatus(any(), any(), any(), any())).thenReturn(new ServiceStatusInfo(healthStatus));
+        when(slobrokMonitorManager.getStatus(any(), any(), any(), any())).thenReturn(new ServiceStatusInfo(slobrokStatus));
         ServiceStatus status = manager.getStatus(
                 ZoneApplication.getApplicationId(),
                 ZoneApplication.getNodeAdminClusterId(),
-                ZoneApplication.getNodeAdminServiceType(), new ConfigId("config-id"));
+                ZoneApplication.getNodeAdminServiceType(), new ConfigId("config-id")).serviceStatus();
         assertSame(expectedStatus, status);
     }
 }
\ No newline at end of file
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 68f5aa8c451..7eba54977cc 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,6 +6,7 @@ import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
+import com.yahoo.vespa.applicationmodel.ServiceStatusInfo;
 import com.yahoo.vespa.service.duper.ConfigServerApplication;
 import com.yahoo.vespa.service.monitor.ServiceStatusProvider;
 import org.junit.Test;
@@ -34,7 +35,7 @@ public class ApplicationInstanceGeneratorTest {
 
     @Test
     public void toApplicationInstance() {
-        when(statusProvider.getStatus(any(), any(), any(), any())).thenReturn(ServiceStatus.NOT_CHECKED);
+        when(statusProvider.getStatus(any(), any(), any(), any())).thenReturn(new ServiceStatusInfo(ServiceStatus.NOT_CHECKED));
         Zone zone = mock(Zone.class);
         ApplicationInfo configServer = configServerApplication.makeApplicationInfo(
                 configServerList.stream().map(HostName::from).collect(Collectors.toList()));
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java
index 96e69f3cb69..0f7c0dde357 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java
@@ -32,8 +32,9 @@ public class ExampleModel {
     static final String TENANT = "tenant";
     static final String APPLICATION_NAME = "application";
     public static final String INSTANCE_NAME = "default";
+    public static final ApplicationId APPLICATION_ID = ApplicationId.from(TENANT, APPLICATION_NAME, INSTANCE_NAME);
 
-    static SuperModel createExampleSuperModelWithOneRpcPort(String hostname, int rpcPort) {
+    public static SuperModel createExampleSuperModelWithOneRpcPort(String hostname, int rpcPort) {
         List<String> hosts = Stream.of(hostname).collect(Collectors.toList());
 
         ApplicationInfo applicationInfo = ExampleModel
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 b77bdb4e54e..37da0611d53 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
@@ -11,6 +11,7 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference;
 import com.yahoo.vespa.applicationmodel.ServiceCluster;
 import com.yahoo.vespa.applicationmodel.ServiceInstance;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
+import com.yahoo.vespa.applicationmodel.ServiceStatusInfo;
 import com.yahoo.vespa.service.monitor.ServiceModel;
 import com.yahoo.vespa.service.monitor.ConfigserverUtil;
 import com.yahoo.vespa.service.duper.ConfigServerApplication;
@@ -43,7 +44,7 @@ public class ModelGeneratorTest {
 
         SlobrokMonitorManagerImpl slobrokMonitorManager = mock(SlobrokMonitorManagerImpl.class);
         when(slobrokMonitorManager.getStatus(any(), any(), any(), any()))
-                .thenReturn(ServiceStatus.UP);
+                .thenReturn(new ServiceStatusInfo(ServiceStatus.UP));
 
         ServiceModel serviceModel =
                 modelGenerator.toServiceModel(
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java
index bc6bff6fba8..0b8a13a8869 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java
@@ -79,7 +79,7 @@ public class SlobrokMonitorManagerImplTest {
         return slobrokMonitorManager.getStatus(
                 application.getApplicationId(),
                 clusterId,
-                new ServiceType(serviceType), new ConfigId("config.id"));
+                new ServiceType(serviceType), new ConfigId("config.id")).serviceStatus();
     }
 
     @Test
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorTest.java
index 907e52298bf..8bec3bf6cd8 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorTest.java
@@ -2,12 +2,14 @@
 package com.yahoo.vespa.service.slobrok;
 
 import com.yahoo.config.model.api.ApplicationInfo;
+import com.yahoo.config.model.api.SuperModel;
 import com.yahoo.jrt.slobrok.api.Mirror;
 import com.yahoo.jrt.slobrok.api.SlobrokList;
 import com.yahoo.vespa.service.model.ExampleModel;
 import org.junit.Test;
 
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 public class SlobrokMonitorTest {
     private final SlobrokList slobrokList = mock(SlobrokList.class);
@@ -24,14 +26,13 @@ public class SlobrokMonitorTest {
 
     @Test
     public void testUpdateSlobrokList2() {
-        /*
         final String hostname = "hostname";
         final int port = 1;
 
         SuperModel superModel = ExampleModel.createExampleSuperModelWithOneRpcPort(hostname, port);
-        slobrokMonitor.updateSlobrokList(superModel.getApplicationInfo());
+        slobrokMonitor.updateSlobrokList(superModel.getApplicationInfo(ExampleModel.APPLICATION_ID).get());
 
         String[] expectedSpecs = new String[] {"tcp/" + hostname + ":" + port};
-        verify(slobrokList).setup(expectedSpecs); */
+        verify(slobrokList).setup(expectedSpecs);
     }
 }