summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-04-25 11:43:05 +0200
committerBjørn Christian Seime <bjorncs@oath.com>2018-04-25 13:54:19 +0200
commitb794c401644eeac293a53a14fff8d4bb6a40a0d1 (patch)
treec6f1ee3082169cdb7251cd1c8b1186691b64616e /node-repository
parent61d6f63fd1b00d9880dd40d2d76e8fdaa8a36e56 (diff)
Include both identity name and hostname in getName()
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodePrincipal.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodePrincipal.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodePrincipal.java
index 62d161a20df..18c78bb84da 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodePrincipal.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodePrincipal.java
@@ -62,7 +62,11 @@ public class NodePrincipal implements Principal {
@Override
public String getName() {
- return identityName;
+ if (hostname == null || identityName.equals(hostname)) {
+ return identityName;
+ } else {
+ return identityName + "/" + hostname;
+ }
}
public enum Type { ATHENZ, LEGACY }