Forgot the icons... doh!

Change-Id: Ic0d7848ea857b9fa78f3399ab98651358da78e73

@@ -25,7 +25,7 @@ import java.util.concurrent.Future;
  */
  */
 public interface FlowRuleProvider extends Provider {
 public interface FlowRuleProvider extends Provider {
 
 
-    static final int POLL_INTERVAL = 1;
+    static final int POLL_INTERVAL = 2;
 
 
     /**
     /**
      * Instructs the provider to apply the specified flow rules to their
      * Instructs the provider to apply the specified flow rules to their

@@ -429,7 +429,7 @@ public abstract class TopologyViewMessages {
                 String label = "";
                 String label = "";
                 if (load.rate() > 0) {
                 if (load.rate() > 0) {
                     hasTraffic = true;
                     hasTraffic = true;
-                    label = load.toString();
+                    label = load.latest() + " bytes";
                 }
                 }
                 labels.add(label);
                 labels.add(label);
             }
             }

@@ -140,6 +140,7 @@
         P: togglePorts,
         P: togglePorts,
         U: unpin,
         U: unpin,
         R: resetZoomPan,
         R: resetZoomPan,
+        H: toggleHover,
         esc: handleEscape
         esc: handleEscape
     };
     };
 
 
@@ -176,7 +177,7 @@
         onosOrder = [],
         onosOrder = [],
         oiBox,
         oiBox,
         oiShowMaster = false,
         oiShowMaster = false,
-
+        hoverEnabled = false,
         portLabelsOn = false;
         portLabelsOn = false;
 
 
     // D3 selections
     // D3 selections
@@ -310,6 +311,10 @@
         });
         });
     }
     }
 
 
+    function toggleHover(view) {
+        hoverEnabled = !hoverEnabled;
+    }
+
     function togglePorts(view) {
     function togglePorts(view) {
         view.alert('togglePorts() callback')
         view.alert('togglePorts() callback')
     }
     }
@@ -1077,6 +1082,8 @@
         linkLabel = linkLabelG.selectAll('.linkLabel')
         linkLabel = linkLabelG.selectAll('.linkLabel')
             .data(data, function (d) { return d.id; });
             .data(data, function (d) { return d.id; });
 
 
+        linkLabel.text(function (d) { return d.label; });
+
         entering = linkLabel.enter().append('g')
         entering = linkLabel.enter().append('g')
             .classed('linkLabel', true)
             .classed('linkLabel', true)
             .attr('id', function (d) { return d.id; });
             .attr('id', function (d) { return d.id; });
@@ -1973,8 +1980,7 @@
     }
     }
 
 
     function trafficHover() {
     function trafficHover() {
-        return false;
-        //return showTrafficOnHover.classed('active');
+        return hoverEnabled;
     }
     }
     function toggleTrafficHover() {
     function toggleTrafficHover() {
         showTrafficOnHover.classed('active', !trafficHover());
         showTrafficOnHover.classed('active', !trafficHover());