commit 3065ba35b590c9d6fcfab925d32789de3bed4836
author Jordan Halterman <jordan@opennetworking.org> Tue Apr 10 15:58:21 2018 -0400
committer Thomas Vachuska <tom@opennetworking.org> Tue Apr 10 22:49:17 2018 +0000
tree 89aa896d85bbb4e53f2164098e21befe1ce81742
parent 1a9e71c8a34c0e15c988234437a09da214e49512

Validate that cluster configuration intersects with existing nodes when forming cluster

Change-Id: I200b25f2e9ae3380ccd90a6b58cd697f1e3029b4
(cherry picked from commit 9a93304b03dfdd34d3679da1dd52fcc676307af2)

core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java

diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java
index d1e926d..56ea048 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java
@@ -166,6 +166,12 @@
         checkNotNull(nodes, "Nodes cannot be null");
         checkArgument(!nodes.isEmpty(), "Nodes cannot be empty");
 
+        // Validate that the given nodes intersect with the currently configured nodes.
+        Set<ControllerNode> existingNodes = Sets.newHashSet(clusterMetadataService.getClusterMetadata().getNodes());
+        checkArgument(
+            !Sets.intersection(nodes, existingNodes).isEmpty(),
+            "Nodes must intersect with current cluster configuration");
+
         ClusterMetadata metadata = new ClusterMetadata("default", nodes, buildDefaultPartitions(nodes, partitionSize));
         clusterMetadataAdminService.setClusterMetadata(metadata);
         try {