diff options
| author | Morten Tokle <mortent@oath.com> | 2019-01-28 15:14:51 +0100 |
|---|---|---|
| committer | Morten Tokle <mortent@oath.com> | 2019-01-28 15:14:51 +0100 |
| commit | f59dbbad447639f0d7e17f1b660624e04a0edab3 (patch) | |
| tree | daad07a77a698c9cc5fa7e6c318774be5bb7346e /controller-server | |
| parent | f4303095fad0731b34638859c786320fb76251eb (diff) | |
Fix alias name
Diffstat (limited to 'controller-server')
2 files changed, 5 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAlias.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAlias.java index 4e1c79248a9..ce3cbddb6e1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAlias.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAlias.java @@ -78,8 +78,7 @@ public class LoadBalancerAlias { ignorePartIfDefault(applicationId.instance().value()), applicationId.application().value(), applicationId.tenant().value(), - zoneId.value(), - "vespa.oath.cloud" + zoneId.value() + "." + "vespa.oath.cloud" ); return parts.stream() .filter(s -> !Strings.isNullOrEmpty((s))) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAliasTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAliasTest.java index 965a639a68c..c0e58078f79 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAliasTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAliasTest.java @@ -18,12 +18,12 @@ public class LoadBalancerAliasTest { public void test_endpoint_names() { ZoneId zoneId = ZoneId.from("prod", "us-north-1"); ApplicationId withInstanceName = ApplicationId.from("tenant", "application", "instance"); - testAlias("instance--application--tenant--prod.us-north-1--vespa.oath.cloud", "default", withInstanceName, zoneId); - testAlias("cluster--instance--application--tenant--prod.us-north-1--vespa.oath.cloud", "cluster", withInstanceName, zoneId); + testAlias("instance--application--tenant--prod.us-north-1.vespa.oath.cloud", "default", withInstanceName, zoneId); + testAlias("cluster--instance--application--tenant--prod.us-north-1.vespa.oath.cloud", "cluster", withInstanceName, zoneId); ApplicationId withDefaultInstance = ApplicationId.from("tenant", "application", "default"); - testAlias("application--tenant--prod.us-north-1--vespa.oath.cloud", "default", withDefaultInstance, zoneId); - testAlias("cluster--application--tenant--prod.us-north-1--vespa.oath.cloud", "cluster", withDefaultInstance, zoneId); + testAlias("application--tenant--prod.us-north-1.vespa.oath.cloud", "default", withDefaultInstance, zoneId); + testAlias("cluster--application--tenant--prod.us-north-1.vespa.oath.cloud", "cluster", withDefaultInstance, zoneId); } private void testAlias(String expected, String clusterName, ApplicationId applicationId, ZoneId zoneId) { |