Test applications response

3 files changed, 29 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
index 94e52c758eb..1a73d1b77e7 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
@@ -408,7 +408,7 @@ public class NodesApiHandler extends LoggingRequestHandler {
         Cursor applications = root.setArray("applications");
         for (ApplicationId id : nodeRepository.applications().ids()) {
             Cursor application = applications.addObject();
-            application.setString("url", withPath("nodes/v2/applications/" + id.toFullString(), uri).toString());
+            application.setString("url", withPath("/nodes/v2/applications/" + id.toFullString(), uri).toString());
             application.setString("id", id.toFullString());
         }
         return new SlimeJsonResponse(slime);
@@ -419,7 +419,7 @@ public class NodesApiHandler extends LoggingRequestHandler {
         if (application.isEmpty())
             return ErrorResponse.notFoundError("No application '" + id + "'");
         Slime slime = ApplicationSerializer.toSlime(application.get(),
-                                                    withPath("nodes/v2/applications/" + id, uri));
+                                                    withPath("/nodes/v2/applications/" + id, uri));
         return new SlimeJsonResponse(slime);
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
index 0001c344dd3..01719450e2b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
@@ -56,7 +56,7 @@ public class RestApiTest {
         if (container != null) container.close();
     }
 
-    /** This test gives examples of all the requests that can be made to nodes/v2 */
+    /** This test gives examples of the node requests that can be made to nodes/v2 */
     @Test
     public void test_requests() throws Exception {
         // GET
@@ -232,6 +232,12 @@ public class RestApiTest {
     }
 
     @Test
+    public void test_application_requests() throws Exception {
+
+        assertFile(new Request("http://localhost:8080/nodes/v2/application/"), "applications.json");
+    }
+
+    @Test
     public void maintenance_requests() throws Exception {
         // POST deactivation of a maintenance job
         assertResponse(new Request("http://localhost:8080/nodes/v2/maintenance/inactive/NodeFailer",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/applications.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/applications.json
new file mode 100644
index 00000000000..6d25b3e59f5
--- /dev/null
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/applications.json
@@ -0,0 +1,20 @@
+{
+  "applications" : [
+    {
+      "url" : "http://localhost:8080/nodes/v2/applications/tenant4.application4.instance4",
+      "id" : "tenant4.application4.instance4"
+    },
+    {
+      "url" : "http://localhost:8080/nodes/v2/applications/tenant2.application2.instance2",
+      "id" : "tenant2.application2.instance2"
+    },
+    {
+      "url" : "http://localhost:8080/nodes/v2/applications/tenant3.application3.instance3",
+      "id" : "tenant3.application3.instance3"
+    },
+    {
+      "url" : "http://localhost:8080/nodes/v2/applications/tenant1.application1.instance1",
+      "id" : "tenant1.application1.instance1"
+    }
+  ]
+}
\ No newline at end of file