commit 740d3281b09f2517c32a302cf12e16e3d98830fe
author Georgios Katsikas <katsikas.gp@gmail.com> Wed Mar 18 12:05:03 2020 +0100
committer Andrea Campanella <andrea@opennetworking.org> Thu May 21 08:40:27 2020 +0000
tree 0b9f30fae754ca3258354d8af4dc2920964e1078
parent 8fb1ef7a00a5b0c9703dae13ce3a342d4b7aa86b

Server device driver extensions

 * Additional behaviours implemented
    * BasicSystemOperations
    * DeviceHandshaker
    * InterfaceConfig
    * PortAdmin
    * QueueConfig
    * TableStatisticsDiscovery
    * DeviceSystemStatisticsQuery
 * New device abstractions on CPU cache and main memory
 * Additional statistics (main memory)
 * New UI with Memory statistics (based on the old gui)
 * Constants decoupled from implementations
 * More builders used for interface implementations
 * Style fixes and refactoring

Change-Id: Ie54ed0fb4760456cfd6339c74b36486dd3c20f87
Signed-off-by: Georgios Katsikas <katsikas.gp@gmail.com>

drivers/server/src/main/java/org/onosproject/drivers/server/gui/LatencyViewMessageHandler.java

diff --git a/drivers/server/src/main/java/org/onosproject/drivers/server/gui/LatencyViewMessageHandler.java b/drivers/server/src/main/java/org/onosproject/drivers/server/gui/LatencyViewMessageHandler.java
index c76c97d..a1c29c3 100644
--- a/drivers/server/src/main/java/org/onosproject/drivers/server/gui/LatencyViewMessageHandler.java
+++ b/drivers/server/src/main/java/org/onosproject/drivers/server/gui/LatencyViewMessageHandler.java
@@ -43,9 +43,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.slf4j.LoggerFactory.getLogger;
-import static org.onosproject.drivers.server.gui.MetricType.LATENCY;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onosproject.drivers.server.Constants.MSG_UI_DATA_LATENCY_NULL;
+import static org.onosproject.drivers.server.gui.MetricType.LATENCY;
+import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Message handler for passing latency data to the Web UI.
@@ -63,7 +64,8 @@
         return ImmutableSet.of(new LatencyMessageRequest());
     }
 
-    private final class LatencyMessageRequest extends BaseViewMessageHandler.ControlMessageRequest {
+    private final class LatencyMessageRequest
+        extends BaseViewMessageHandler.ControlMessageRequest {
 
         private LatencyMessageRequest() {
             super(LATENCY_DATA_REQ, LATENCY_DATA_RESP, LATENCY_LABEL);
@@ -71,7 +73,7 @@
 
         @Override
         protected String[] getSeries() {
-            return createSeries(LATENCY, MAX_COLUMNS_NB);
+            return createIndexedSeries(LATENCY, MAX_COLUMNS_NB);
         }
 
         @Override
@@ -93,17 +95,17 @@
                 Map<Integer, Float[]> data = null;
                 MonitoringStatistics monStats = serverDriver.getGlobalMonitoringStatistics(deviceId);
                 if (monStats == null) {
-                    data = populateZeroDataHistory(deviceId, MAX_COLUMNS_NB);
+                    data = populateZeroMapDataHistory(deviceId, MAX_COLUMNS_NB);
                 } else {
                     data = populateLatencyDataHistory(deviceId, serverDev.numberOfCpus(), monStats);
                 }
-                checkNotNull(data, "No latency data history to visualize");
+                checkNotNull(data, MSG_UI_DATA_LATENCY_NULL);
 
                 // Generate a timestamp
                 LocalDateTime ldt = new LocalDateTime(timestamp);
 
                 // Project the data
-                populateMetrics(cm, data, ldt, LATENCY, NUM_OF_DATA_POINTS);
+                populateMapMetrics(cm, data, ldt, LATENCY, NUM_OF_DATA_POINTS);
 
                 Set<DeviceId> deviceIds = Sets.newHashSet();
                 for (Device device : ds.getAvailableDevices()) {
@@ -129,16 +131,16 @@
                     Map<Integer, Float> data = null;
                     MonitoringStatistics monStats = serverDriver.getGlobalMonitoringStatistics(deviceId);
                     if (monStats == null) {
-                        data = populateZeroData(deviceId, MAX_COLUMNS_NB);
+                        data = populateZeroMapData(deviceId, MAX_COLUMNS_NB);
                     } else {
                         data = populateLatencyData(deviceId, serverDev.numberOfCpus(), monStats);
                     }
-                    checkNotNull(data, "No latency data to visualize");
+                    checkNotNull(data, MSG_UI_DATA_LATENCY_NULL);
 
                     // Map them to the CPU cores
                     Map<String, Object> local = Maps.newHashMap();
                     for (int i = 0; i < data.size(); i++) {
-                        local.put(getLabel(LATENCY, i), data.get(i));
+                        local.put(getIndexedLabel(LATENCY, i), data.get(i));
                     }
 
                     // Last piece of data is the device ID
@@ -164,7 +166,7 @@
          */
         private Map<Integer, Float> populateLatencyData(
                 DeviceId deviceId, int length, MonitoringStatistics monStats) {
-            Map<Integer, Float> data = initializeData(MAX_COLUMNS_NB);
+            Map<Integer, Float> data = initializeMapData(MAX_COLUMNS_NB);
 
             for (CpuStatistics stats : monStats.cpuStatisticsAll()) {
                 int index = stats.id();
@@ -207,7 +209,7 @@
          */
         private Map<Integer, Float[]> populateLatencyDataHistory(
                 DeviceId deviceId, int length, MonitoringStatistics monStats) {
-            Map<Integer, Float[]> data = initializeDataHistory(MAX_COLUMNS_NB);
+            Map<Integer, Float[]> data = initializeMapDataHistory(MAX_COLUMNS_NB);
 
             for (CpuStatistics stats : monStats.cpuStatisticsAll()) {
                 int index = stats.id();