Merge "Add testsuite "os-odl-ovs-noha""

[yardstick.git] / yardstick / network_services / vnf_generic / vnf / prox_vnf.py

diff --git a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py
index 36f1a19..366c5b2 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py
+++ b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py
@@ -89,16 +89,19 @@ class ProxApproxVnf(SampleVNF):
             raise RuntimeError("Failed ..Invalid no of ports .. "
                                "1, 2 or 4 ports only supported at this time")
 
-        self.port_stats = self.vnf_execute('port_stats', range(port_count))
+        all_port_stats = self.vnf_execute('multi_port_stats', range(port_count))
+        rx_total = tx_total = tsc = 0
         try:
-            rx_total = self.port_stats[6]
-            tx_total = self.port_stats[7]
-            tsc = self.port_stats[10]
-        except IndexError:
-            LOG.debug("port_stats parse fail ")
-            # return empty dict so we don't mess up existing KPIs
+            for single_port_stats in all_port_stats:
+                rx_total = rx_total + single_port_stats[1]
+                tx_total = tx_total + single_port_stats[2]
+                tsc = tsc + single_port_stats[5]
+        except (TypeError, IndexError):
+            LOG.error("Invalid data ...")
             return {}
 
+        tsc = tsc / port_count
+
         result = {
             "packets_in": rx_total,
             "packets_dropped": max((tx_total - rx_total), 0),
@@ -107,10 +110,19 @@ class ProxApproxVnf(SampleVNF):
             # collectd KPIs here and not TG KPIs, so use a different method name
             "collect_stats": self.resource_helper.collect_collectd_kpi(),
         }
-        curr_packets_in = int(((rx_total - self.prev_packets_in) * self.tsc_hz)
-                                / (tsc - self.prev_tsc) * port_count)
-        curr_packets_fwd = int(((tx_total - self.prev_packets_sent) * self.tsc_hz)
-                                / (tsc - self.prev_tsc) * port_count)
+        try:
+            curr_packets_in = int(((rx_total - self.prev_packets_in) * self.tsc_hz)
+                                / (tsc - self.prev_tsc))
+        except ZeroDivisionError:
+            LOG.error("Error.... Divide by Zero")
+            curr_packets_in = 0
+
+        try:
+            curr_packets_fwd = int(((tx_total - self.prev_packets_sent) * self.tsc_hz)
+                                / (tsc - self.prev_tsc))
+        except ZeroDivisionError:
+            LOG.error("Error.... Divide by Zero")
+            curr_packets_fwd = 0
 
         result["curr_packets_in"] = curr_packets_in
         result["curr_packets_fwd"] = curr_packets_fwd