Merge pull request #2900 from yahoo/freva/add-trustedNetworks-acl-spec

Freva/add trusted networks acl spec

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;
+        }
+    }
 }