summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-06-28 16:08:35 +0200
committervalerijf <valerijf@yahoo-inc.com>2017-06-28 16:08:35 +0200
commit96d2113c2adaf6a3bd4bd0182faad10135d982a9 (patch)
tree947b2fc81deee1c66c6a40c0310367a05c56a95d
parentea28e3b41a79de5a2ccbfb8683cef8803b32b154 (diff)
Added trustedNetworks to NodeAcl
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeAcl.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeAcl.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeAcl.java
index 0386f3a5ddc..a6190f41c07 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeAcl.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeAcl.java
@@ -7,7 +7,8 @@ import com.yahoo.vespa.hosted.provision.Node;
import java.util.Set;
/**
- * A node ACL. The ACL contains the node which the ACL is valid for, and a set of nodes that the node should trust.
+ * A node ACL. The ACL contains the node which the ACL is valid for,
+ * a set of nodes and networks that the node should trust.
*
* @author mpolden
*/
@@ -15,10 +16,12 @@ public class NodeAcl {
private final Node node;
private final Set<Node> trustedNodes;
+ private final Set<String> trustedNetworks;
- public NodeAcl(Node node, Set<Node> trustedNodes) {
+ public NodeAcl(Node node, Set<Node> trustedNodes, Set<String> trustedNetworks) {
this.node = node;
this.trustedNodes = ImmutableSet.copyOf(trustedNodes);
+ this.trustedNetworks = ImmutableSet.copyOf(trustedNetworks);
}
public Node node() {
@@ -28,4 +31,8 @@ public class NodeAcl {
public Set<Node> trustedNodes() {
return trustedNodes;
}
+
+ public Set<String> trustedNetworks() {
+ return trustedNetworks;
+ }
}