Merge "Improve IXIA TG Rx/TX throughput calculation"

3 files changed, 24 insertions, 38 deletions

diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
index 26dc1fe04..760b1e8d3 100644
--- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py
+++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
@@ -168,12 +168,8 @@ 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])
-        rx_throughput = sum(
-            [samples[iface]['RxThroughput'] for iface in samples])
-        rx_throughput = round(float(rx_throughput), 2)
-        tx_throughput = sum(
-            [samples[iface]['TxThroughput'] for iface in samples])
-        tx_throughput = round(float(tx_throughput), 2)
+        rx_throughput = round(float(in_packets_sum) / duration, 3)
+        tx_throughput = round(float(out_packets_sum) / duration, 3)
         packet_drop = abs(out_packets_sum - in_packets_sum)
 
         try:
diff --git a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
index 05eaba6b4..8b1687450 100644
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -78,8 +78,8 @@ class IxiaResourceHelper(ClientResourceHelper):
                     "tx_throughput_mbps": float(stats["Tx_Rate_Mbps"][port_num]),
                     "in_packets": int(stats["Valid_Frames_Rx"][port_num]),
                     "out_packets": int(stats["Frames_Tx"][port_num]),
-                    "RxThroughput": int(stats["Valid_Frames_Rx"][port_num]) / duration,
-                    "TxThroughput": int(stats["Frames_Tx"][port_num]) / duration,
+                    "RxThroughput": float(stats["Valid_Frames_Rx"][port_num]) / duration,
+                    "TxThroughput": float(stats["Frames_Tx"][port_num]) / duration,
                 }
                 avg_latency = stats["Store-Forward_Avg_latency_ns"][port_num]
                 min_latency = stats["Store-Forward_Min_latency_ns"][port_num]
diff --git a/yardstick/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py b/yardstick/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
index 6f76eb77c..27ab4607b 100644
--- a/yardstick/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
+++ b/yardstick/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
@@ -575,87 +575,77 @@ class TestIXIARFC2544Profile(unittest.TestCase):
 
     def test_get_drop_percentage_completed(self):
         samples = {'iface_name_1':
-                       {'RxThroughput': 10, 'TxThroughput': 10,
-                        'in_packets': 1000, 'out_packets': 1000},
+                       {'in_packets': 1000, 'out_packets': 1000},
                    'iface_name_2':
-                       {'RxThroughput': 11, 'TxThroughput': 13,
-                        'in_packets': 1005, 'out_packets': 1007}
+                       {'in_packets': 1005, 'out_packets': 1007}
                    }
         rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         completed, samples = rfc2544_profile.get_drop_percentage(samples, 0, 1)
         self.assertTrue(completed)
-        self.assertEqual(23.0, samples['TxThroughput'])
-        self.assertEqual(21.0, samples['RxThroughput'])
+        self.assertEqual(66.9, samples['TxThroughput'])
+        self.assertEqual(66.833, samples['RxThroughput'])
         self.assertEqual(0.099651, samples['DropPercentage'])
 
     def test_get_drop_percentage_over_drop_percentage(self):
         samples = {'iface_name_1':
-                       {'RxThroughput': 10, 'TxThroughput': 10,
-                        'in_packets': 1000, 'out_packets': 1000},
+                       {'in_packets': 1000, 'out_packets': 1000},
                    'iface_name_2':
-                       {'RxThroughput': 11, 'TxThroughput': 13,
-                        'in_packets': 1005, 'out_packets': 1007}
+                       {'in_packets': 1005, 'out_packets': 1007}
                    }
         rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         rfc2544_profile.rate = 1000
         completed, samples = rfc2544_profile.get_drop_percentage(
             samples, 0, 0.05)
         self.assertFalse(completed)
-        self.assertEqual(23.0, samples['TxThroughput'])
-        self.assertEqual(21.0, samples['RxThroughput'])
+        self.assertEqual(66.9, samples['TxThroughput'])
+        self.assertEqual(66.833, samples['RxThroughput'])
         self.assertEqual(0.099651, samples['DropPercentage'])
         self.assertEqual(rfc2544_profile.rate, rfc2544_profile.max_rate)
 
     def test_get_drop_percentage_under_drop_percentage(self):
         samples = {'iface_name_1':
-                       {'RxThroughput': 10, 'TxThroughput': 10,
-                        'in_packets': 1000, 'out_packets': 1000},
+                       {'in_packets': 1000, 'out_packets': 1000},
                    'iface_name_2':
-                       {'RxThroughput': 11, 'TxThroughput': 13,
-                        'in_packets': 1005, 'out_packets': 1007}
+                       {'in_packets': 1005, 'out_packets': 1007}
                    }
         rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         rfc2544_profile.rate = 1000
         completed, samples = rfc2544_profile.get_drop_percentage(
             samples, 0.2, 1)
         self.assertFalse(completed)
-        self.assertEqual(23.0, samples['TxThroughput'])
-        self.assertEqual(21.0, samples['RxThroughput'])
+        self.assertEqual(66.9, samples['TxThroughput'])
+        self.assertEqual(66.833, samples['RxThroughput'])
         self.assertEqual(0.099651, samples['DropPercentage'])
         self.assertEqual(rfc2544_profile.rate, rfc2544_profile.min_rate)
 
     @mock.patch.object(ixia_rfc2544.LOG, 'info')
     def test_get_drop_percentage_not_flow(self, *args):
         samples = {'iface_name_1':
-                       {'RxThroughput': 0, 'TxThroughput': 10,
-                        'in_packets': 1000, 'out_packets': 0},
+                       {'in_packets': 1000, 'out_packets': 0},
                    'iface_name_2':
-                       {'RxThroughput': 0, 'TxThroughput': 13,
-                        'in_packets': 1005, 'out_packets': 0}
+                       {'in_packets': 1005, 'out_packets': 0}
                    }
         rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         rfc2544_profile.rate = 1000
         completed, samples = rfc2544_profile.get_drop_percentage(
             samples, 0.2, 1)
         self.assertFalse(completed)
-        self.assertEqual(23.0, samples['TxThroughput'])
-        self.assertEqual(0, samples['RxThroughput'])
+        self.assertEqual(0.0, samples['TxThroughput'])
+        self.assertEqual(66.833, samples['RxThroughput'])
         self.assertEqual(100, samples['DropPercentage'])
         self.assertEqual(rfc2544_profile.rate, rfc2544_profile.max_rate)
 
     def test_get_drop_percentage_first_run(self):
         samples = {'iface_name_1':
-                       {'RxThroughput': 10, 'TxThroughput': 10,
-                        'in_packets': 1000, 'out_packets': 1000},
+                       {'in_packets': 1000, 'out_packets': 1000},
                    'iface_name_2':
-                       {'RxThroughput': 11, 'TxThroughput': 13,
-                        'in_packets': 1005, 'out_packets': 1007}
+                       {'in_packets': 1005, 'out_packets': 1007}
                    }
         rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         completed, samples = rfc2544_profile.get_drop_percentage(
             samples, 0, 1, first_run=True)
         self.assertTrue(completed)
-        self.assertEqual(23.0, samples['TxThroughput'])
-        self.assertEqual(21.0, samples['RxThroughput'])
+        self.assertEqual(66.9, samples['TxThroughput'])
+        self.assertEqual(66.833, samples['RxThroughput'])
         self.assertEqual(0.099651, samples['DropPercentage'])
         self.assertEqual(33.45, rfc2544_profile.rate)