mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-25 22:31:07 +02:00
Code Issues Projects Releases Wiki Activity

Removed redundant checks from Topo2Jsonifier.

Browse Source 
Change-Id: I98af34fa2c14889af8acf716b410da24885f4330
This commit is contained in:
Simon Hunt 2016-10-27 12:47:24 -07:00
parent 8601627219
commit cd508a658e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
View File

@ -216,13 +216,8 @@ class Topo2Jsonifier {
return payload; return payload;
} }
payload.put("id", region.idAsString()); payload.put("id", region.idAsString());
if (subRegions != null) { payload.set("subregions", jsonSubRegions(subRegions));
payload.set("subregions", jsonSubRegions(subRegions)); payload.set("links", jsonLinks(links));
}
if (links != null) {
payload.set("links", jsonLinks(links));
}
List<String> layerTags = region.layerOrder(); List<String> layerTags = region.layerOrder();
List<Set<UiNode>> splitDevices = splitByLayer(layerTags, region.devices()); List<Set<UiNode>> splitDevices = splitByLayer(layerTags, region.devices());