Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 4105: Add dynamic module/shard config for entity-owners shard
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
utils
/
MockConfiguration.java
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 6b0f9624cde0e42cac73b53ac5339e3f5051672e..554e67b1f17d60c1b842809455e09e90cbc6ba51 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
@@
-8,7
+8,6
@@
package org.opendaylight.controller.cluster.datastore.utils;
package org.opendaylight.controller.cluster.datastore.utils;
-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;
@@
-18,7
+17,8
@@
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;
-import org.opendaylight.controller.cluster.datastore.Configuration;
+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{
import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy;
public class MockConfiguration implements Configuration{
@@
-34,26
+34,22
@@
public class MockConfiguration implements Configuration{
}
@Override
}
@Override
- public
List
<String> getMemberShardNames(final String memberName) {
+ public
Collection
<String> getMemberShardNames(final String memberName) {
return new ArrayList<>(shardMembers.keySet());
}
return new ArrayList<>(shardMembers.keySet());
}
- @Override
- public Optional<String> getModuleNameFromNameSpace(
- final String nameSpace) {
- return Optional.absent();
- }
@Override
@Override
- public
Map<String, ShardStrategy> getModuleNameToShardStrategyMap(
) {
- return
Collections.emptyMap()
;
+ public
String getModuleNameFromNameSpace(final String nameSpace
) {
+ return
null
;
}
}
- @Override
public List<String> getShardNamesFromModuleName(
-
final String moduleName) {
- return
Collections.emptyList()
;
+ @Override
+
public String getShardNameForModule(
final String moduleName) {
+ return
null
;
}
}
- @Override public List<String> getMembersFromShardName(final String shardName) {
+ @Override
+ public Collection<String> getMembersFromShardName(final String shardName) {
if("default".equals(shardName)) {
return Arrays.asList("member-1", "member-2");
} else if("astronauts".equals(shardName)){
if("default".equals(shardName)) {
return Arrays.asList("member-1", "member-2");
} else if("astronauts".equals(shardName)){
@@
-77,4
+73,13
@@
public class MockConfiguration implements Configuration{
return allNames;
}
return allNames;
}
+
+ @Override
+ public ShardStrategy getStrategyForModule(String moduleName) {
+ return null;
+ }
+
+ @Override
+ public void addModuleShardConfiguration(ModuleShardConfiguration config) {
+ }
}
}