Fixed a few more defects and usability issues in GUI traffic monitoring.

Change-Id: Ifd6daabafcd996bd855de9ac836606e138901f9d

Fixed a few more defects and usability issues in GUI traffic monitoring.
Change-Id: Ifd6daabafcd996bd855de9ac836606e138901f9d
Thomas Vachuska · Gerrit Code Review
Commit b7e4064526e6b1dc64603fb914015e0190410032 b7e40645 1 parent 427a2147
Showing 2 changed files with 55 additions and 24 deletions
web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
web/gui/src/main/webapp/topo.js
--- a/web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
View file @b7e4064
+++ b/web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
View file @b7e4064
@@ -213,7 +213,7 @@ public class TopologyViewWebSocket
             processMessage((ObjectNode) mapper.reader().readTree(data));
         } catch (Exception e) {
             log.warn("Unable to parse GUI request {} due to {}", data, e);
-            log.warn("Boom!!!", e);
+            log.debug("Boom!!!", e);
         }
     }
@@ -231,11 +231,18 @@ public class TopologyViewWebSocket
             createMultiSourceIntent(event);
         } else if (type.equals("requestRelatedIntents")) {
+            stopTrafficMonitoring();
             requestRelatedIntents(event);
+
         } else if (type.equals("requestNextRelatedIntent")) {
-            requestNextRelatedIntent(event);
+            stopTrafficMonitoring();
+            requestAnotherRelatedIntent(event, +1);
+        } else if (type.equals("requestPrevRelatedIntent")) {
+            stopTrafficMonitoring();
+            requestAnotherRelatedIntent(event, -1);
         } else if (type.equals("requestSelectedIntentTraffic")) {
             requestSelectedIntentTraffic(event);
+            startTrafficMonitoring(event);
         } else if (type.equals("requestAllTraffic")) {
             requestAllTraffic(event);
@@ -267,6 +274,7 @@ public class TopologyViewWebSocket
             }
         } catch (IOException e) {
             log.warn("Unable to send message {} to GUI due to {}", data, e);
+            log.debug("Boom!!!", e);
         }
     }
@@ -380,7 +388,7 @@ public class TopologyViewWebSocket
         selectedIntents = new ArrayList<>();
         selectedIntents.add(intent);
         currentIntentIndex = -1;
-        requestNextRelatedIntent(event);
+        requestAnotherRelatedIntent(event, +1);
         requestSelectedIntentTraffic(event);
     }
@@ -467,27 +475,31 @@ public class TopologyViewWebSocket
                                                        intentService.getIntents());
         currentIntentIndex = -1;
-        String hover = string(payload, "hover");
         if (haveSelectedIntents()) {
             // Send a message to highlight all links of all monitored intents.
             sendMessage(trafficMessage(sid, new TrafficClass("primary", selectedIntents)));
-        } else if (!isNullOrEmpty(hover)) {
-            // If there is a hover node, include it in the selection and find intents.
-            processExtendedSelection(sid, hover);
         }
+
+        // FIXME: Re-introduce one the client click vs hover gesture stuff is sorted out.
+//        String hover = string(payload, "hover");
+//        if (!isNullOrEmpty(hover)) {
+//            // If there is a hover node, include it in the selection and find intents.
+//            processHoverExtendedSelection(sid, hover);
+//        }
     }
     private boolean haveSelectedIntents() {
         return selectedIntents != null && !selectedIntents.isEmpty();
     }
-    private void processExtendedSelection(long sid, String hover) {
+    // Processes the selection extended with hovered item to segregate items
-        if (haveSelectedIntents()) {
+    // into primary (those including the hover) vs secondary highlights.
+    private void processHoverExtendedSelection(long sid, String hover) {
         Set<Host> hoverSelHosts = new HashSet<>(selectedHosts);
         Set<Device> hoverSelDevices = new HashSet<>(selectedDevices);
         addHover(hoverSelHosts, hoverSelDevices, hover);
-            List<Intent> primary =
+        List<Intent> primary = selectedIntents == null ? new ArrayList<>() :
                 intentFilter.findPathIntents(hoverSelHosts, hoverSelDevices,
                                              selectedIntents);
         Set<Intent> secondary = new HashSet<>(selectedIntents);
@@ -497,12 +509,23 @@ public class TopologyViewWebSocket
         sendMessage(trafficMessage(sid, new TrafficClass("primary", primary),
                                    new TrafficClass("secondary", secondary)));
     }
-    }
-    // Requests next of the related intents.
+    // Requests next or previous related intent.
-    private void requestNextRelatedIntent(ObjectNode event) {
+    private void requestAnotherRelatedIntent(ObjectNode event, int offset) {
         if (haveSelectedIntents()) {
-            currentIntentIndex = (currentIntentIndex + 1) % selectedIntents.size();
+            currentIntentIndex = currentIntentIndex + offset;
+            if (currentIntentIndex < 0) {
+                currentIntentIndex = selectedIntents.size() - 1;
+            } else if (currentIntentIndex >= selectedIntents.size()) {
+                currentIntentIndex = 0;
+            }
+            sendSelectedIntent(event);
+        }
+    }
+
+    // Sends traffic information on the related intents with the currently
+    // selected intent highlighted.
+    private void sendSelectedIntent(ObjectNode event) {
         Intent selectedIntent = selectedIntents.get(currentIntentIndex);
         log.info("Requested next intent {}", selectedIntent.id());
@@ -517,7 +540,6 @@ public class TopologyViewWebSocket
                                    new TrafficClass("primary", primary),
                                    new TrafficClass("secondary", secondary)));
     }
-    }
     // Requests monitoring of traffic for the selected intent.
     private void requestSelectedIntentTraffic(ObjectNode event) {
@@ -679,7 +701,7 @@ public class TopologyViewWebSocket
                 }
             } catch (Exception e) {
                 log.warn("Unable to handle traffic request due to {}", e.getMessage());
-                log.warn("Boom!", e);
+                log.debug("Boom!", e);
             }
         }
     }
@@ -694,6 +716,7 @@ public class TopologyViewWebSocket
                 }
             } catch (Exception e) {
                 log.warn("Unable to handle summary request due to {}", e.getMessage());
+                log.debug("Boom!", e);
             }
         }
     }
@@ -712,8 +735,8 @@ public class TopologyViewWebSocket
                 }
             } catch (Exception e) {
                 log.warn("Unable to handle summary request due to {}", e.getMessage());
+                log.debug("Boom!", e);
             }
-
         }
     }
 }
--- a/web/gui/src/main/webapp/topo.js
View file @b7e4064
+++ b/web/gui/src/main/webapp/topo.js
View file @b7e4064
@@ -146,7 +146,8 @@
         U: [unpin, 'Unpin node (hover mouse over)'],
         R: [resetPanZoom, 'Reset pan / zoom'],
         V: [showRelatedIntentsAction, 'Show all related intents'],
-        N: [showNextIntentAction, 'Show next related intent'],
+        rightArrow: [showNextIntentAction, 'Show next related intent'],
+        leftArrow: [showPrevIntentAction, 'Show previous related intent'],
         W: [showSelectedIntentTrafficAction, 'Monitor traffic of selected intent'],
         A: [showAllTrafficAction, 'Monitor all traffic'],
         F: [showDeviceLinkFlowsAction, 'Show device link flows'],
@@ -1232,7 +1233,7 @@
     function showRelatedIntentsAction() {
         hoverMode = hoverModeIntents;
         requestRelatedIntents();
-        flash('Related intents');
+        flash('Related Paths');
     }
     function requestRelatedIntents() {
@@ -1252,14 +1253,20 @@
     function showNextIntentAction() {
         hoverMode = hoverModeNone;
-        sendMessage('requestNextRelatedIntent', {});
+        sendMessage('requestNextRelatedIntent');
-        flash('Next related intent');
+        flash('>');
+    }
+
+    function showPrevIntentAction() {
+        hoverMode = hoverModeNone;
+        sendMessage('requestPrevRelatedIntent');
+        flash('<');
     }
     function showSelectedIntentTrafficAction() {
         hoverMode = hoverModeNone;
-        sendMessage('requestSelectedIntentTraffic', {});
+        sendMessage('requestSelectedIntentTraffic');
-        flash('Monitoring selected intent');
+        flash('Traffic on Selected Path');
     }
     function showDeviceLinkFlowsAction() {
@@ -3018,7 +3025,8 @@
     }
     function startAntTimer() {
-        if (!antTimer) {
+        // Note: disabled until traffic can be allotted to intents properly
+        if (false && !antTimer) {
             var pulses = [5, 3, 1.2, 3],
                 pulse = 0;
             antTimer = setInterval(function () {