Bug 4105: Add method to get all unique member names

Added a method to Configuration to get all unique members names
configured for all shards.

Change-Id: I09993541ad7e5963e9eef9cb58b4376daa8f09e8
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit c3ba770fd6e9ba6e6227717bdba11ccc9f468f05)

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Configuration.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Configuration.java
index b2646060539332fc45d58776aaf0a7efe2b0d3ff..c57d2d4733c7e1a6838d137d0a3176da987dabe3 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Configuration.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Configuration.java
@@ -9,11 +9,11 @@
 package org.opendaylight.controller.cluster.datastore;
 
 import com.google.common.base.Optional;
 package org.opendaylight.controller.cluster.datastore;
 
 import com.google.common.base.Optional;

-import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy;
-
+import java.util.Collection;

 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

+import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy;

 
 public interface Configuration {
 
 
 public interface Configuration {
 


@@ -59,4 +59,9 @@ public interface Configuration {
      * @return
      */
     Set<String> getAllShardNames();
      * @return
      */
     Set<String> getAllShardNames();

+
+    /**
+     * Returns a unique set of all member names configured for all shards.
+     */
+    Collection<String> getUniqueMemberNamesForAllShards();

 }
 }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ConfigurationImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ConfigurationImpl.java
index 0541e3a48bb1aab6cef1843e429ff700949d7688..4d83dea96f89af07d76c72fd21bb7ecd8d481f75 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ConfigurationImpl.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ConfigurationImpl.java
@@ -21,8 +21,10 @@ import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigObject;
 import java.io.File;
 import java.util.ArrayList;
 import com.typesafe.config.ConfigObject;
 import java.io.File;
 import java.util.ArrayList;

+import java.util.Collection;

 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Collections;
 import java.util.HashMap;

+import java.util.HashSet;

 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;


@@ -198,6 +200,16 @@ public class ConfigurationImpl implements Configuration {
         return allShardNames;
     }
 
         return allShardNames;
     }
 

+    @Override
+    public Collection<String> getUniqueMemberNamesForAllShards() {
+        Set<String> allNames = new HashSet<>();
+        for(String shardName: allShardNames) {
+            allNames.addAll(getMembersFromShardName(shardName));
+        }
+
+        return allNames;
+    }
+

     private List<Module> readModules(final Config modulesConfig) {
         List<? extends ConfigObject> modulesConfigObjectList =
             modulesConfig.getObjectList("modules");
     private List<Module> readModules(final Config modulesConfig) {
         List<? extends ConfigObject> modulesConfigObjectList =
             modulesConfig.getObjectList("modules");

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ConfigurationImplTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ConfigurationImplTest.java
index 4e0089e48d2ab20ab701d45c316d5da6baaf728c..53c3a89589d663f108d59510145ac239607407c8 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ConfigurationImplTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ConfigurationImplTest.java
@@ -11,6 +11,7 @@ package org.opendaylight.controller.cluster.datastore;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

+import com.google.common.collect.Sets;

 import com.typesafe.config.ConfigFactory;
 import java.io.File;
 import java.util.List;
 import com.typesafe.config.ConfigFactory;
 import java.io.File;
 import java.util.List;


@@ -101,4 +102,10 @@ public class ConfigurationImplTest {
         assertTrue(allShardNames.contains("cars-1"));
         assertTrue(allShardNames.contains("test-1"));
     }
         assertTrue(allShardNames.contains("cars-1"));
         assertTrue(allShardNames.contains("test-1"));
     }

+
+    @Test
+    public void testGetUniqueMemberNamesForAllShards() {
+        assertEquals("getUniqueMemberNamesForAllShards", Sets.newHashSet("member-1", "member-2", "member-3"),
+                configuration.getUniqueMemberNamesForAllShards());
+    }

 }
 }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockConfiguration.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockConfiguration.java
index 0bc561f1bd053f49674f34ac396afd50e6ba70ae..6b0f9624cde0e42cac73b53ac5339e3f5051672e 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockConfiguration.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockConfiguration.java
@@ -12,7 +12,9 @@ import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Arrays;

+import java.util.Collection;

 import java.util.Collections;
 import java.util.Collections;

+import java.util.HashSet;

 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;


@@ -65,4 +67,14 @@ public class MockConfiguration implements Configuration{
     @Override public Set<String> getAllShardNames() {
         return Collections.emptySet();
     }
     @Override public Set<String> getAllShardNames() {
         return Collections.emptySet();
     }

+
+    @Override
+    public Collection<String> getUniqueMemberNamesForAllShards() {
+        Set<String> allNames = new HashSet<>();
+        for(List<String> l: shardMembers.values()) {
+            allNames.addAll(l);
+        }
+
+        return allNames;
+    }

 }
 }