Use model instead of config for getting logserver connection info

* Add unit test
* Minor refactorings

1 files changed, 23 insertions, 1 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
index b091ec29b75..c34cb565878 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
@@ -95,7 +95,7 @@ public class ApplicationHandlerTest {
                 provisioner,
                 new ApplicationConvergenceChecker(stateApiFactory),
                 mockHttpProxy,
-                new LogServerLogGrabber());
+                new MockLogServerLogGrabber());
         listApplicationsHandler = new ListApplicationsHandler(
                 Runnable::run, AccessLog.voidAccessLog(), tenants, Zone.defaultZone());
     }
@@ -219,6 +219,14 @@ public class ApplicationHandlerTest {
     }
 
     @Test
+    public void testGrabLog() throws Exception {
+        long sessionId = 1;
+        ApplicationId application = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(mytenantName).build();
+        addMockApplication(tenants.getTenant(mytenantName), application, sessionId);
+        assertEquals("log line", grabLog(application, Zone.defaultZone()));
+    }
+
+    @Test
     public void testClusterControllerStatus() throws Exception {
         long sessionId = 1;
         ApplicationId application = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(mytenantName).build();
@@ -386,6 +394,13 @@ public class ApplicationHandlerTest {
         HandlerTest.assertHttpStatusCodeAndMessage(response, 200, "");
     }
 
+    private String grabLog(ApplicationId application, Zone zone) throws IOException {
+        String restartUrl = toUrlPath(application, zone, true) + "/log";
+        HttpResponse response = mockHandler.handle(HttpRequest.createTestRequest(restartUrl, com.yahoo.jdisc.http.HttpRequest.Method.POST));
+        HandlerTest.assertHttpStatusCodeAndMessage(response, 200, "");
+        return SessionHandlerTest.getRenderedString(response);
+    }
+
     private static class MockStateApiFactory implements ApplicationConvergenceChecker.StateApiFactory {
         public boolean createdApi = false;
         @Override
@@ -400,4 +415,11 @@ public class ApplicationHandlerTest {
             };
         }
     }
+
+    private static class MockLogServerLogGrabber extends LogServerLogGrabber {
+        @Override
+        protected String readLog(String host, int port) throws IOException {
+            return "log line";
+        }
+    }
 }