Two quick bug-fixes for the demo

Signed-off-by: Katrina LaCurts <katrina.lacurts@plexxi.com>

diff --git a/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/HostStats.java b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/HostStats.java
index b6419b44b544f3d0e65c1fe242a88a0965a96eb3..1b372f20ee53c6aefdef973d3bdd6b829ee39965 100644 (file)
--- a/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/HostStats.java
+++ b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/HostStats.java
@@ -57,6 +57,8 @@ public class HostStats {
 
     // Returns the maximum duration across all protocols
     public double getDuration() {
+        if (this.durations.isEmpty())
+            return 0.0;
         return Collections.max(this.durations.values());
     }
 

diff --git a/scripts/stats.py b/scripts/stats.py
index 1d4105b63925da784876b3513f9918b2736dd775..87a78f125be1d283dc38a59a4d2d0bb1bac2227a 100644 (file)
--- a/scripts/stats.py
+++ b/scripts/stats.py
@@ -69,13 +69,13 @@ class Stats:
             resp, content = self.http.request(self.url_prefix + "incoming/" + self.subnet, "GET")
             data = json.loads(content)
             if (data == {}): return []
-            host_data = data['hosts']['entry']
+            data = data['stats']
             ips = []
             total_bytes_in = self.get_bytes()
-            n = len(host_data)
-            for d in host_data:
-                bytes_from_ip = int(d['value'])
-                ip = d['key'].replace("/", "") # IPs sometimes (always?) get returned as strings like /1.2.3.4
+            n = len(data)
+            for d in data:
+                bytes_from_ip = int(d['byteCount'])
+                ip = d['hostIP'].replace("/", "") # IPs sometimes (always?) get returned as strings like /1.2.3.4
                 if (bytes_from_ip >= total_bytes_in / float(n)):
                     ips.append(ip)
             return ips