commit 89eeccd86e289440ed16138b4a6e5e55be3254b1
author Jian Li <pyguni@gmail.com> Fri May 06 02:10:33 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri May 06 22:02:47 2016 +0000
tree da2782028a7764bb1bf2247a9a95404e63df22b4
parent 612ae54632357eb3e6255a87adc7a9a5baec8c62

Support to query available resources from remote node

Change-Id: I465327143b5959b9e18daac9481ffea332f889c8

apps/cpman/app/src/main/java/org/onosproject/cpman/cli/ResourceNameCompleter.java

diff --git a/apps/cpman/app/src/main/java/org/onosproject/cpman/cli/ResourceNameCompleter.java b/apps/cpman/app/src/main/java/org/onosproject/cpman/cli/ResourceNameCompleter.java
index fe0aae2..07e669e 100644
--- a/apps/cpman/app/src/main/java/org/onosproject/cpman/cli/ResourceNameCompleter.java
+++ b/apps/cpman/app/src/main/java/org/onosproject/cpman/cli/ResourceNameCompleter.java
@@ -21,6 +21,7 @@
 import org.apache.karaf.shell.console.completer.StringsCompleter;
 import org.onosproject.cli.AbstractCompleter;
 import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cluster.NodeId;
 import org.onosproject.cpman.ControlPlaneMonitorService;
 import org.onosproject.cpman.ControlResource;
 import org.slf4j.Logger;
@@ -40,7 +41,7 @@
     private static final String NETWORK = "network";
     private static final String DISK = "disk";
     private static final String CONTROL_MESSAGE = "control_message";
-    Set<String> resourceTypes = ImmutableSet.of(NETWORK, DISK, CONTROL_MESSAGE);
+    private final Set<String> resourceTypes = ImmutableSet.of(NETWORK, DISK, CONTROL_MESSAGE);
     private static final String INVALID_MSG = "Invalid type name";
 
 
@@ -51,7 +52,8 @@
 
         // Resource type is the second argument.
         ArgumentCompleter.ArgumentList list = getArgumentList();
-        String type = list.getArguments()[1];
+        String nodeId = list.getArguments()[1];
+        String type = list.getArguments()[2];
 
         if (resourceTypes.contains(type)) {
             ControlPlaneMonitorService monitorService =
@@ -60,13 +62,16 @@
             Set<String> set = Sets.newHashSet();
             switch (type) {
                 case NETWORK:
-                    set = monitorService.availableResources(ControlResource.Type.NETWORK);
+                    set = monitorService.availableResourcesSync(NodeId.nodeId(nodeId),
+                            ControlResource.Type.NETWORK);
                     break;
                 case DISK:
-                    set = monitorService.availableResources(ControlResource.Type.DISK);
+                    set = monitorService.availableResourcesSync(NodeId.nodeId(nodeId),
+                            ControlResource.Type.DISK);
                     break;
                 case CONTROL_MESSAGE:
-                    set = monitorService.availableResources(ControlResource.Type.CONTROL_MESSAGE);
+                    set = monitorService.availableResourcesSync(NodeId.nodeId(nodeId),
+                            ControlResource.Type.CONTROL_MESSAGE);
                     break;
                 default:
                     log.warn(INVALID_MSG);
@@ -76,7 +81,7 @@
             SortedSet<String> strings = delegate.getStrings();
 
             if (set.size() != 0) {
-                set.forEach(s -> strings.add(s));
+                set.forEach(strings::add);
             }
         }