Point to instance-specific paths

5 files changed, 9 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 0f513854206..7ba78034839 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -1274,8 +1274,11 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         object.setString("tenant", application.id().tenant().value());
         object.setString("application", application.id().application().value());
         object.setString("instance", application.id().instance().value());
-        object.setString("url", withPath("/application/v4/tenant/" + application.id().tenant().value() +
-                                         "/application/" + application.id().application().value(), request.getUri()).toString());
+        object.setString("url", withPath("/application/v4" +
+                                               "/tenant/" + application.id().tenant().value() +
+                                               "/application/" + application.id().application().value() +
+                                               "/instance/" + application.id().instance().value(),
+                                         request.getUri()).toString());
     }
 
     private Slime toSlime(ActivateResult result) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-reference-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-reference-2.json
index ff22b95739d..0c9dc2ca1e7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-reference-2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-reference-2.json
@@ -2,5 +2,5 @@
   "tenant": "tenant2",
   "application": "application2",
   "instance": "default",
-  "url": "http://localhost:8080/application/v4/tenant/tenant2/application/application2"
+  "url": "http://localhost:8080/application/v4/tenant/tenant2/application/application2/instance/default"
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-reference.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-reference.json
index 1d56944f6bc..7117cc22507 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-reference.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-reference.json
@@ -2,5 +2,5 @@
   "tenant": "tenant1",
   "application":"application1",
   "instance":"default",
-  "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1"
+  "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/default"
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json
index b222c33291c..0a99248b012 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json
@@ -8,7 +8,7 @@
       "tenant": "tenant1",
       "application":"application1",
       "instance":"default",
-      "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1"
+      "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/default"
     }
   ]
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-created.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-created.json
index 2a779f0ee55..6cf4dc76173 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-created.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-created.json
@@ -2,5 +2,5 @@
   "tenant": "my-tenant",
   "application": "my-app",
   "instance": "default",
-  "url": "http://localhost:8080/application/v4/tenant/my-tenant/application/my-app"
+  "url": "http://localhost:8080/application/v4/tenant/my-tenant/application/my-app/instance/default"
 }