From 1df2f7b5b63c16955ea0bde6cc8e524e31ed0b79 Mon Sep 17 00:00:00 2001 From: Ido Barnea Date: Sun, 29 May 2016 11:00:37 +0300 Subject: Fix for broken latency example --- .../trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'scripts/automation/trex_control_plane/stl/trex_stl_lib') diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py index 6b34b11a..ee4bd1f9 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py @@ -1026,9 +1026,15 @@ class CLatencyStats(CTRexStats): if current_pg['latency']['h'] != "": output[int_pg_id]['latency']['average'] = current_pg['latency']['h']['s_avg'] output[int_pg_id]['latency']['total_max'] = current_pg['latency']['h']['max_usec'] - output[int_pg_id]['latency']['histogram'] = {elem['key']: elem['val'] for elem in current_pg['latency']['h']['histogram']} + output[int_pg_id]['latency']['histogram'] = {elem['key']: elem['val'] + for elem in current_pg['latency']['h']['histogram']} zero_count = current_pg['latency']['h']['cnt'] - current_pg['latency']['h']['high_cnt'] - output[int_pg_id]['latency']['histogram'][0] = zero_count + if zero_count != 0: + output[int_pg_id]['latency']['total_min'] = 1 + output[int_pg_id]['latency']['histogram'][0] = zero_count + else: + output[int_pg_id]['latency']['total_min'] = min(output[int_pg_id]['latency']['histogram'].keys()) + self.latest_stats = output return True -- cgit From c2ef504829e655253e38138cc0add99ff04788d6 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Sun, 29 May 2016 11:07:53 +0300 Subject: revert hltapi change --- .../trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/automation/trex_control_plane/stl/trex_stl_lib') diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py index 0f68d4a3..464869aa 100755 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py @@ -1529,11 +1529,11 @@ def get_TOS(user_kwargs, kwargs): TOS1 = set(['ip_precedence', 'ip_delay', 'ip_throughput', 'ip_reliability', 'ip_cost', 'ip_reserved']) TOS2 = set(['ip_dscp', 'ip_cu']) user_args = set(user_kwargs.keys()) - if user_args & TOS0.symmetric_difference(TOS1): + if user_args & (TOS1 - TOS0) and user_args & (TOS0 - TOS1): raise STLError('You have mixed %s and %s TOS parameters' % (TOS0, TOS1)) - if user_args & TOS0.symmetric_difference(TOS2): + if user_args & (TOS2 - TOS0) and user_args & (TOS0 - TOS2): raise STLError('You have mixed %s and %s TOS parameters' % (TOS0, TOS2)) - if user_args & TOS1.symmetric_difference(TOS2): + if user_args & (TOS2 - TOS1) and user_args & (TOS1 - TOS2): raise STLError('You have mixed %s and %s TOS parameters' % (TOS1, TOS2)) if user_args & (TOS0 - TOS1 - TOS2): return (kwargs['ip_precedence'] << 5) + (kwargs['ip_tos_field'] << 2) + kwargs['ip_mbz'] -- cgit