mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-14 08:51:01 +02:00
Code Issues Projects Releases Wiki Activity

resources CLI

Browse Source 
Change-Id: Idac7ae69c8264da80cb1b55628990690803eaf89
This commit is contained in:
goeonpark 2018-09-15 02:56:06 +09:00 committed by Thomas Vachuska
parent 5cf77f54e3
commit 84bbd859ab
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
View File

@ -172,10 +172,18 @@ public class ResourcesCommand extends AbstractShellCommand {
List<Resource> nonAggregatable = new ArrayList<>(); List<Resource> nonAggregatable = new ArrayList<>();
for (Resource r : children) { for (Resource r : children) {
if (!isPrintTarget(r)) { if (!isPrintTarget(r)) { // A
continue; continue;
} }
if (r instanceof DiscreteResource) {
if (resourceService.getRegisteredResources(((DiscreteResource) r).id()).isEmpty()) {
// resource which has children should be printed
continue;
}
}
if (r instanceof ContinuousResource) { if (r instanceof ContinuousResource) {
// non-aggregatable terminal node // non-aggregatable terminal node
nonAggregatable.add(r); nonAggregatable.add(r);
@ -188,6 +196,7 @@ public class ResourcesCommand extends AbstractShellCommand {
} }
} }
// print aggregated (terminal) // print aggregated (terminal)
aggregatables.asMap().entrySet() aggregatables.asMap().entrySet()
.forEach(e -> { .forEach(e -> {
@ -236,12 +245,7 @@ public class ResourcesCommand extends AbstractShellCommand {
String resourceName = resource.simpleTypeName(); String resourceName = resource.simpleTypeName();
if (resource instanceof DiscreteResource) { if (resource instanceof DiscreteResource) {
// TODO This distributed store access incurs overhead.
// This should be merged with the one in printResource()
if (!resourceService.getRegisteredResources(((DiscreteResource) resource).id()).isEmpty()) {
// resource which has children should be printed
return true;
}
if (availablesOnly && !resourceService.isAvailable(resource)) { if (availablesOnly && !resourceService.isAvailable(resource)) {
// don't print unavailable discrete resource // don't print unavailable discrete resource
return false; return false;
@ -250,7 +254,6 @@ public class ResourcesCommand extends AbstractShellCommand {
log.warn("Unexpected resource class: {}", resource.getClass().getSimpleName()); log.warn("Unexpected resource class: {}", resource.getClass().getSimpleName());
return false; return false;
} }
return typesToPrint.contains(resourceName); return typesToPrint.contains(resourceName);
} }
} }