diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-02-05 10:30:10 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-02-05 10:30:10 +0100 |
| commit | 6b8be31a169e2fc998dcca83445fcb2763f3272e (patch) | |
| tree | c15d83e1c4a755186aac31347dcc4c47672e045f /controller-server | |
| parent | ba497f6fbd01ee04e99d0a33af0530a54678f07c (diff) | |
Update tests
Diffstat (limited to 'controller-server')
4 files changed, 7 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationRotation.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationRotation.java index f0bf8f54447..d0aba06279f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationRotation.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationRotation.java @@ -28,7 +28,7 @@ public class ApplicationRotation { sanitize(application.tenant().value()), DNS_SUFFIX, port)); - this.secureUrl = URI.create(String.format("https://%s--%s.%s:%d", + this.secureUrl = URI.create(String.format("https://%s--%s.%s:%d/", sanitize(application.application().value()), sanitize(application.tenant().value()), DNS_SUFFIX, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json index e46c755e8bf..8bb5cc6da46 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json @@ -205,7 +205,8 @@ ], "compileVersion": "(ignore)", "globalRotations": [ - "http://application1.tenant1.global.vespa.yahooapis.com:4080/" + "http://application1.tenant1.global.vespa.yahooapis.com:4080/", + "https://application1--tenant1.global.vespa.yahooapis.com:4443/" ], "rotationId": "rotation-id-1", "instances": [ diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json index b5ed2d407df..ca37d602711 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json @@ -146,7 +146,8 @@ ], "compileVersion": "(ignore)", "globalRotations": [ - "http://application1.tenant1.global.vespa.yahooapis.com:4080/" + "http://application1.tenant1.global.vespa.yahooapis.com:4080/", + "https://application1--tenant1.global.vespa.yahooapis.com:4443/" ], "rotationId": "rotation-id-1", "instances": [ diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json index caca0ad8970..82a5a5b856d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json @@ -146,7 +146,8 @@ ], "compileVersion": "6.1.0", "globalRotations": [ - "http://application1.tenant1.global.vespa.yahooapis.com:4080/" + "http://application1.tenant1.global.vespa.yahooapis.com:4080/", + "https://application1--tenant1.global.vespa.yahooapis.com:4443/" ], "rotationId": "rotation-id-1", "instances": [ |