commit b2ba8abb378cfc9e4d70eb1f10a9109680c750b0
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Sep 21 19:45:41 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 23 23:20:45 2016 +0000
tree 7df955f56d1c51dd464bfe1ea59806117a01ed0e
parent 3d66aca4f7fc3748813c6b9b3a5e6316d1aa0709

Print Port allocations

Change-Id: I590cdcef5d338294e6468e2c4bceb8fa2614b3ab

cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java b/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java
index 0882429..ab8b6de 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java
@@ -20,7 +20,9 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 import com.google.common.base.Strings;
@@ -53,13 +55,15 @@
          description = "Lists allocated resources")
 public class AllocationsCommand extends AbstractShellCommand {
 
-    @Option(name = "-t", aliases = "--type", description = "List of resource types",
+    @Option(name = "-t", aliases = "--type",
+            description = "resource types to include in the list",
             required = false, multiValued = true)
     String[] typeStrings = null;
 
     Set<String> typesToPrint;
 
-    @Option(name = "-i", aliases = "--intentId", description = "Intent ID",
+    @Option(name = "-i", aliases = "--intentId",
+            description = "Intent ID to include in the list",
             required = false, multiValued = true)
     String[] intentStrings;
 
@@ -129,7 +133,21 @@
             // print DeviceId when Port was directly specified.
             print("%s", did);
         }
-        print("%s%s", Strings.repeat(" ", level), asVerboseString(num));
+
+        DiscreteResourceId resourceId = Resources.discrete(did, num).id();
+
+        List<String> portConsumers = resourceService.getResourceAllocations(resourceId)
+            .stream()
+            .filter(this::isSubjectToPrint)
+            .map(ResourceAllocation::consumerId)
+            .map(AllocationsCommand::asVerboseString)
+            .collect(Collectors.toList());
+        if (portConsumers.isEmpty()) {
+            print("%s%s", Strings.repeat(" ", level), asVerboseString(num));
+        } else {
+            print("%s%s allocated by %s", Strings.repeat(" ", level), asVerboseString(num),
+                                        portConsumers);
+        }
 
         // FIXME: This workaround induces a lot of distributed store access.
         //        ResourceService should have an API to get all allocations under a parent resource.
@@ -141,7 +159,6 @@
                 .add(TributarySlot.class)
                 .build();
 
-        DiscreteResourceId resourceId = Resources.discrete(did, num).id();
         for (Class<?> t : subResourceTypes) {
             resourceService.getResourceAllocations(resourceId, t).stream()
                     .filter(a -> isSubjectToPrint(a))