summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-06-28 16:12:00 +0200
committervalerijf <valerijf@yahoo-inc.com>2017-06-28 16:12:00 +0200
commit318aac1958ae96e84e6329e8496b82f5089a64ff (patch)
tree7b64556b376211402bd79eafb7a52706d56eb815 /node-admin
parent6d01adedf7617d3db6f451dc96a84e1a9f3a2d2f (diff)
Update AclResponse in node-admin
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/bindings/GetAclResponse.java22
1 files changed, 21 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/bindings/GetAclResponse.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/bindings/GetAclResponse.java
index 908bde3e8f1..254ab5fa3ba 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/bindings/GetAclResponse.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/bindings/GetAclResponse.java
@@ -19,9 +19,14 @@ public class GetAclResponse {
@JsonProperty("trustedNodes")
public final List<Node> trustedNodes;
+ @JsonProperty("trustedNetworks")
+ public final List<Network> trustedNetworks;
+
@JsonCreator
- public GetAclResponse(@JsonProperty("trustedNodes") List<Node> trustedNodes) {
+ public GetAclResponse(@JsonProperty("trustedNodes") List<Node> trustedNodes,
+ @JsonProperty("trustedNetworks") List<Network> trustedNetworks) {
this.trustedNodes = trustedNodes == null ? Collections.emptyList() : trustedNodes;
+ this.trustedNetworks = trustedNetworks == null ? Collections.emptyList() : trustedNetworks;
}
public static class Node {
@@ -43,4 +48,19 @@ public class GetAclResponse {
this.trustedBy = trustedBy;
}
}
+
+ public static class Network {
+
+ @JsonProperty("network")
+ public final String network;
+
+ @JsonProperty("trustedBy")
+ public final String trustedBy;
+
+ @JsonCreator
+ public Network(@JsonProperty("network") String network, @JsonProperty("trustedBy") String trustedBy) {
+ this.network = network;
+ this.trustedBy = trustedBy;
+ }
+ }
}