commit fe3a9a78e6147a8d5867a977b48fa7339720497b
author Madan Jampani <madan@onlab.us> Fri Mar 13 16:32:26 2015 -0700
committer Brian O'Connor <bocon@onlab.us> Tue Mar 17 18:05:07 2015 +0000
tree 8732a7aadcc866e5e2a1027c07fcbc9482540ed5
parent f9f2cbb2c97f1b7ed6d4662fa2dd7aac1c77fa82

ONOS-1310: less verbose partitions cli command

Change-Id: I2ff341ec7a6760543dddc350425f840b425eff83

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
index 9eed61a..b78f3ae 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
@@ -65,6 +65,8 @@
     private static final String PARTITION_DEFINITION_FILE = "tablets.json";
     private static final int DATABASE_STARTUP_TIMEOUT_SEC = 60;
 
+    private final PartitionedDatabaseConfig databaseConfig = new PartitionedDatabaseConfig();
+
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ClusterService clusterService;
 
@@ -114,8 +116,6 @@
             .withMembers(activeNodeUris)
             .withLocalMember(localNodeUri);
 
-        PartitionedDatabaseConfig databaseConfig = new PartitionedDatabaseConfig();
-
         partitionMap.forEach((name, nodes) -> {
             Set<String> replicas = nodes.stream().map(this::nodeToUri).collect(Collectors.toSet());
             DatabaseConfig partitionConfig = new DatabaseConfig()
@@ -181,7 +181,7 @@
         return partitionedDatabase.getRegisteredPartitions()
                 .values()
                 .stream()
-                .map(DatabaseManager::toPartitionInfo)
+                .map(db -> toPartitionInfo(db, databaseConfig.partitions().get(db.name())))
                 .collect(Collectors.toList());
     }
 
@@ -191,11 +191,12 @@
      * @param database database containing input data
      * @return PartitionInfo object
      */
-    private static PartitionInfo toPartitionInfo(Database database) {
+    private static PartitionInfo toPartitionInfo(Database database, DatabaseConfig dbConfig) {
         return new PartitionInfo(database.name(),
                           database.cluster().term(),
                           database.cluster().members().stream()
                                   .map(Member::uri)
+                                  .filter(uri -> dbConfig.getReplicas().contains(uri))
                                   .collect(Collectors.toList()),
                           database.cluster().leader() != null ?
                                   database.cluster().leader().uri() : null);