diff options
| author |   Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-07-26 14:33:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-26 14:33:17 +0000 |
| commit | b7ce705c0662671983f034d99c01941af8bc5d68 (patch) | |
| tree | d3af4b5c99f2db30e9ff3cb37b1e0d5fcb64640a /yardstick/network_services/traffic_profile | |
| parent | bc9601ba236447ea3003411e2a7f705545759340 (diff) | |
| parent | 851419fe355e1e3323ec03a7bc8e3085094e4f86 (diff) | |
Merge "Make injection time configurable for IXIA RFC2544 test cases"
Diffstat (limited to 'yardstick/network_services/traffic_profile')
| -rw-r--r-- | yardstick/network_services/traffic_profile/ixia_rfc2544.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py index c32e9d8c9..43455330f 100644 --- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py +++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py @@ -100,7 +100,7 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile): return result def _ixia_traffic_generate(self, traffic, ixia_obj): - ixia_obj.update_frame(traffic) + ixia_obj.update_frame(traffic, self.config.duration) ixia_obj.update_ip_packet(traffic) ixia_obj.start_traffic() @@ -137,11 +137,12 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile): self._ixia_traffic_generate(traffic, ixia_obj) return first_run - def get_drop_percentage(self, samples, tol_min, tolerance, duration=30.0, + def get_drop_percentage(self, samples, tol_min, tolerance, first_run=False): completed = False drop_percent = 100 num_ifaces = len(samples) + duration = self.config.duration in_packets_sum = sum( [samples[iface]['in_packets'] for iface in samples]) out_packets_sum = sum( @@ -169,7 +170,7 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile): completed = True if drop_percent <= tolerance else False if (first_run and self.rate_unit == tp_base.TrafficProfileConfig.RATE_FPS): - self.rate = out_packets_sum / duration / num_ifaces + self.rate = float(out_packets_sum) / duration / num_ifaces if drop_percent > tolerance: self.max_rate = self.rate |