ONOS-1479 - GUI Topology Overlay Work - (WIP)
- Implemented initial ability to have overlay modify the summary panel data.
Change-Id: I0d6bd6d62f0e0d5ba9d901a47271044e0c8d0c89
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopoOverlayCache.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopoOverlayCache.java
index 2490041..3d6d900 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopoOverlayCache.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopoOverlayCache.java
@@ -22,13 +22,22 @@
import java.util.HashMap;
import java.util.Map;
+import static com.google.common.base.Strings.isNullOrEmpty;
+
/**
* A cache of {@link org.onosproject.ui.UiTopoOverlay}'s that were registered
* at the time the UI connection was established.
*/
public class TopoOverlayCache {
+ private static final UiTopoOverlay NONE = new NullOverlay();
+
private final Map<String, UiTopoOverlay> overlays = new HashMap<>();
+ private UiTopoOverlay current = NONE;
+
+ public TopoOverlayCache() {
+ overlays.put(null, NONE);
+ }
/**
* Adds a topology overlay to the cache.
@@ -55,16 +64,18 @@
public void switchOverlay(String deact, String act) {
UiTopoOverlay toDeactivate = getOverlay(deact);
UiTopoOverlay toActivate = getOverlay(act);
- if (toDeactivate != null) {
- toDeactivate.deactivate();
- }
- if (toActivate != null) {
- toActivate.activate();
- }
+
+ toDeactivate.deactivate();
+ current = toActivate;
+ current.activate();
}
private UiTopoOverlay getOverlay(String id) {
- return id == null ? null : overlays.get(id);
+ return isNullOrEmpty(id) ? NONE : overlays.get(id);
+ }
+
+ public UiTopoOverlay currentOverlay() {
+ return current;
}
/**
@@ -75,4 +86,28 @@
public int size() {
return overlays.size();
}
+
+
+
+ private static class NullOverlay extends UiTopoOverlay {
+ public NullOverlay() {
+ super(null);
+ }
+
+ @Override
+ public void init() {
+ }
+
+ @Override
+ public void activate() {
+ }
+
+ @Override
+ public void deactivate() {
+ }
+
+ @Override
+ public void destroy() {
+ }
+ }
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
index 6d2295a..11839df 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
@@ -57,6 +57,7 @@
import org.onosproject.ui.JsonUtils;
import org.onosproject.ui.RequestHandler;
import org.onosproject.ui.UiConnection;
+import org.onosproject.ui.topo.PropertyPanel;
import java.util.ArrayList;
import java.util.Collection;
@@ -561,7 +562,10 @@
// Subscribes for summary messages.
private synchronized void requestSummary(long sid) {
- sendMessage(summmaryMessage(sid));
+ PropertyPanel pp = summmaryMessage(sid);
+ overlayCache.currentOverlay().modifySummary(pp);
+ ObjectNode json = JsonUtils.envelope("showSummary", sid, json(pp));
+ sendMessage(json);
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index 336d6f2..42dcd9f 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -72,6 +72,7 @@
import org.onosproject.ui.JsonUtils;
import org.onosproject.ui.UiConnection;
import org.onosproject.ui.UiMessageHandler;
+import org.onosproject.ui.topo.PropertyPanel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -443,19 +444,20 @@
}
// Returns summary response.
- protected ObjectNode summmaryMessage(long sid) {
+ protected PropertyPanel summmaryMessage(long sid) {
Topology topology = topologyService.currentTopology();
- return JsonUtils.envelope("showSummary", sid,
- json("ONOS Summary", "node",
- new Prop("Devices", format(topology.deviceCount())),
- new Prop("Links", format(topology.linkCount())),
- new Prop("Hosts", format(hostService.getHostCount())),
- new Prop("Topology SCCs", format(topology.clusterCount())),
- new Separator(),
- new Prop("Intents", format(intentService.getIntentCount())),
- new Prop("Tunnels", format(tunnelService.tunnelCount())),
- new Prop("Flows", format(flowService.getFlowRuleCount())),
- new Prop("Version", version)));
+ PropertyPanel pp = new PropertyPanel("ONOS Summary", "node")
+ .add(new PropertyPanel.Prop("Devices", format(topology.deviceCount())))
+ .add(new PropertyPanel.Prop("Links", format(topology.linkCount())))
+ .add(new PropertyPanel.Prop("Hosts", format(hostService.getHostCount())))
+ .add(new PropertyPanel.Prop("Topology SCCs", format(topology.clusterCount())))
+ .add(new PropertyPanel.Separator())
+ .add(new PropertyPanel.Prop("Intents", format(intentService.getIntentCount())))
+ .add(new PropertyPanel.Prop("Tunnels", format(tunnelService.tunnelCount())))
+ .add(new PropertyPanel.Prop("Flows", format(flowService.getFlowRuleCount())))
+ .add(new PropertyPanel.Prop("Version", version));
+
+ return pp;
}
// Returns device details response.
@@ -840,6 +842,20 @@
link.dst().elementId(), link.dst().port());
}
+ protected ObjectNode json(PropertyPanel pp) {
+ ObjectNode result = objectNode()
+ .put("title", pp.title()).put("type", pp.typeId());
+ ObjectNode pnode = objectNode();
+ ArrayNode porder = arrayNode();
+ for (PropertyPanel.Prop p : pp.properties()) {
+ porder.add(p.key());
+ pnode.put(p.key(), p.value());
+ }
+ result.set("propOrder", porder);
+ result.set("props", pnode);
+ return result;
+ }
+
// Produces JSON property details.
private ObjectNode json(String id, String type, Prop... props) {
ObjectNode result = objectNode()