X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Futils%2FMockConfiguration.java;h=b5b880265f471a27bb8da9093595000997a8749c;hb=4f1f2ae598588f6aa5aac59b2206d97ad402a193;hp=0d036d36992c776748d7af786ef89ac0119e55ab;hpb=60dbe8adeda3af724255231af9400341b17953b9;p=controller.git

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 0d036d3699..b5b880265f 100644
--- 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
@@ -8,116 +8,32 @@
 
 package org.opendaylight.controller.cluster.datastore.utils;
 
-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.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import org.opendaylight.controller.cluster.datastore.config.Configuration;
-import org.opendaylight.controller.cluster.datastore.config.ModuleShardConfiguration;
-import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy;
-
-public class MockConfiguration implements Configuration{
-    private Map<String, List<String>> shardMembers = ImmutableMap.<String, List<String>>builder().
-            put("default", Arrays.asList("member-1", "member-2")).
-            /*put("astronauts", Arrays.asList("member-2", "member-3")).*/build();
+import java.util.stream.Collectors;
+import org.opendaylight.controller.cluster.access.concepts.MemberName;
+import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl;
+import org.opendaylight.controller.cluster.datastore.config.ModuleConfig;
 
+public class MockConfiguration extends ConfigurationImpl {
     public MockConfiguration() {
+        this(Collections.singletonMap("default", Arrays.asList("member-1", "member-2")));
     }
 
-    public MockConfiguration(Map<String, List<String>> shardMembers) {
-        this.shardMembers = shardMembers;
-    }
-
-    @Override
-    public Collection<String> getMemberShardNames(final String memberName) {
-        ArrayList<String> shardNames = new ArrayList<String>();
-        for(Map.Entry<String, List<String>> shard : shardMembers.entrySet()) {
-            if (shard.getValue().contains(memberName)) {
-                shardNames.add(shard.getKey());
-            }
-        }
-        return shardNames;
-    }
-
-    @Override
-    public String getModuleNameFromNameSpace(final String nameSpace) {
-        return null;
-    }
-
-    @Override
-    public String getShardNameForModule(final String moduleName) {
-        return null;
-    }
-
-    @Override
-    public Collection<String> getMembersFromShardName(final String shardName) {
-        if("default".equals(shardName)) {
-            return Arrays.asList("member-1", "member-2");
-        } else if("astronauts".equals(shardName)){
-            return Arrays.asList("member-2", "member-3");
-        }
-
-        List<String> members = shardMembers.get(shardName);
-        return members != null ? members : Collections.<String>emptyList();
-    }
-
-    @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;
-    }
-
-    @Override
-    public ShardStrategy getStrategyForModule(String moduleName) {
-        return null;
-    }
-
-    @Override
-    public void addModuleShardConfiguration(ModuleShardConfiguration config) {
-    }
-
-    @Override
-    public boolean isShardConfigured(String shardName) {
-        return (shardMembers.containsKey(shardName));
-    }
-
-    @Override
-    public void addMemberReplicaForShard (String shardName, String newMemberName) {
-        Map<String, List<String>> newShardMembers = new HashMap<>(shardMembers);
-        for(Map.Entry<String, List<String>> shard : newShardMembers.entrySet()) {
-            if (shard.getKey().equals(shardName)) {
-                List<String> replicas = new ArrayList<>(shard.getValue());
-                replicas.add(newMemberName);
-                shard.setValue(replicas);
-                shardMembers = ImmutableMap.<String, List<String>>builder().putAll(newShardMembers).build();
+    public MockConfiguration(final Map<String, List<String>> shardMembers) {
+        super(configuration -> {
+            Map<String, ModuleConfig.Builder> retMap = new HashMap<>();
+            for(Map.Entry<String, List<String>> e : shardMembers.entrySet()) {
+                String shardName = e.getKey();
+                retMap.put(shardName,
+                    ModuleConfig.builder(shardName).shardConfig(
+                        shardName, e.getValue().stream().map(MemberName::forName).collect(Collectors.toList())));
             }
-        }
-    }
 
-    @Override
-    public void removeMemberReplicaForShard (String shardName, String newMemberName) {
-        Map<String, List<String>> newShardMembers = new HashMap<>(shardMembers);
-        for(Map.Entry<String, List<String>> shard : newShardMembers.entrySet()) {
-            if (shard.getKey().equals(shardName)) {
-                List<String> replicas = new ArrayList<>(shard.getValue());
-                replicas.remove(newMemberName);
-                shard.setValue(replicas);
-                shardMembers = ImmutableMap.<String, List<String>>builder().putAll(newShardMembers).build();
-            }
-        }
+            return retMap;
+        });
     }
 }