Add IXIA Tx/Rx Bytes stats into results

Add IXIA "Bytes Rx" and "Bytes Tx" ports stats into collected
results. This stats allows to calculate the throughput when
running IMIX traffic.

JIRA: YARDSTICK-1592

Change-Id: I1db678d410b37e7a0f64dc743e6e620e495115ed
Signed-off-by: Oleksandr Naumets <oleksandrx.naumets@intel.com>

2 files changed, 28 insertions, 0 deletions

diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
index c4664a36a..aded2d347 100644
--- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py
+++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
@@ -209,8 +209,16 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
             [samples[iface]['in_packets'] for iface in samples])
         out_packets_sum = sum(
             [samples[iface]['out_packets'] for iface in samples])
+        in_bytes_sum = sum(
+            [samples[iface]['in_bytes'] for iface in samples])
+        out_bytes_sum = sum(
+            [samples[iface]['out_bytes'] for iface in samples])
         rx_throughput = round(float(in_packets_sum) / duration, 3)
         tx_throughput = round(float(out_packets_sum) / duration, 3)
+        # Rx throughput in Bps
+        rx_throughput_bps = round(float(in_bytes_sum) / duration, 3)
+        # Tx throughput in Bps
+        tx_throughput_bps = round(float(out_bytes_sum) / duration, 3)
         packet_drop = abs(out_packets_sum - in_packets_sum)
 
         try:
@@ -262,6 +270,8 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile):
 
         samples['TxThroughput'] = tx_throughput
         samples['RxThroughput'] = rx_throughput
+        samples['TxThroughputBps'] = tx_throughput_bps
+        samples['RxThroughputBps'] = rx_throughput_bps
         samples['DropPercentage'] = drop_percent
         samples['latency_ns_avg'] = latency_ns_avg
         samples['latency_ns_min'] = latency_ns_min
@@ -351,8 +361,16 @@ class IXIARFC2544PppoeScenarioProfile(IXIARFC2544Profile):
             [samples[iface]['in_packets'] for iface in samples])
         out_packets_sum = sum(
             [samples[iface]['out_packets'] for iface in samples])
+        in_bytes_sum = sum(
+            [samples[iface]['in_bytes'] for iface in samples])
+        out_bytes_sum = sum(
+            [samples[iface]['out_bytes'] for iface in samples])
         rx_throughput = round(float(in_packets_sum) / duration, 3)
         tx_throughput = round(float(out_packets_sum) / duration, 3)
+        # Rx throughput in Bps
+        rx_throughput_bps = round(float(in_bytes_sum) / duration, 3)
+        # Tx throughput in Bps
+        tx_throughput_bps = round(float(out_bytes_sum) / duration, 3)
         sum_packet_drop = abs(out_packets_sum - in_packets_sum)
 
         try:
@@ -374,6 +392,8 @@ class IXIARFC2544PppoeScenarioProfile(IXIARFC2544Profile):
 
         samples['TxThroughput'] = tx_throughput
         samples['RxThroughput'] = rx_throughput
+        samples['TxThroughputBps'] = tx_throughput_bps
+        samples['RxThroughputBps'] = rx_throughput_bps
         samples['DropPercentage'] = sum_drop_percent
         samples['latency_ns_avg'] = latency_ns_avg
         samples['latency_ns_min'] = latency_ns_min
diff --git a/yardstick/network_services/traffic_profile/rfc2544.py b/yardstick/network_services/traffic_profile/rfc2544.py
index 86ef0db5e..b838bf814 100644
--- a/yardstick/network_services/traffic_profile/rfc2544.py
+++ b/yardstick/network_services/traffic_profile/rfc2544.py
@@ -278,10 +278,16 @@ class RFC2544Profile(trex_traffic_profile.TrexProfile):
         in_pkt_end = sum(port['in_packets'] for port in samples[-1].values())
         out_pkt_ini = sum(port['out_packets'] for port in samples[0].values())
         in_pkt_ini = sum(port['in_packets'] for port in samples[0].values())
+        in_bytes_ini = sum(port['in_bytes'] for port in samples[0].values())
+        out_bytes_ini = sum(port['out_bytes'] for port in samples[0].values())
+        in_bytes_end = sum(port['in_bytes'] for port in samples[-1].values())
+        out_bytes_end = sum(port['out_bytes'] for port in samples[-1].values())
         time_diff = (list(samples[-1].values())[0]['timestamp'] -
                      list(samples[0].values())[0]['timestamp']).total_seconds()
         out_packets = out_pkt_end - out_pkt_ini
         in_packets = in_pkt_end - in_pkt_ini
+        out_bytes = out_bytes_end - out_bytes_ini
+        in_bytes = in_bytes_end - in_bytes_ini
         tx_rate_fps = float(out_packets) / time_diff
         rx_rate_fps = float(in_packets) / time_diff
         drop_percent = 100.0
@@ -320,6 +326,8 @@ class RFC2544Profile(trex_traffic_profile.TrexProfile):
         output = {
             'TxThroughput': tx_rate_fps,
             'RxThroughput': rx_rate_fps,
+            'RxThroughputBps': round(float(in_bytes) / time_diff, 3),
+            'TxThroughputBps': round(float(out_bytes) / time_diff, 3),
             'CurrentDropPercentage': drop_percent,
             'Throughput': throughput,
             'DropPercentage': self.drop_percent_max,