Working on Bay-Area-Region Demo.
- added latitude / longitude parameters to regions, so the icons can be "placed" on a GEO-map
Change-Id: I5cf939f22597d4658ab603459b2b3059ba0db0c9
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
index 9e02334..323ccee 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
@@ -36,6 +36,7 @@
import org.onosproject.net.host.HostService;
import org.onosproject.net.intent.IntentService;
import org.onosproject.net.link.LinkService;
+import org.onosproject.net.region.Region;
import org.onosproject.net.statistic.StatisticService;
import org.onosproject.net.topology.TopologyService;
import org.onosproject.ui.JsonUtils;
@@ -292,8 +293,8 @@
return node;
}
- private void addProps(ObjectNode node, Device dev) {
- Annotations annot = dev.annotations();
+ private void addProps(ObjectNode node, Annotated a) {
+ Annotations annot = a.annotations();
ObjectNode props = objectNode();
if (annot != null) {
annot.keys().forEach(k -> props.put(k, annot.value(k)));
@@ -404,7 +405,10 @@
.put("nodeType", REGION)
.put("nDevs", region.deviceCount())
.put("nHosts", region.hostCount());
- // TODO: complete closed-region details
+
+ Region r = region.backingRegion();
+ addGeoLocation(node, r);
+ addProps(node, r);
addMetaUi(node, region.idAsString());
return node;