diff options
author | 2016-05-28 05:08:16 +0300 | |
---|---|---|
committer | 2016-05-28 05:08:16 +0300 | |
commit | b0b3908b1b3742b84b48298fb8f7524e422bb28d (patch) | |
tree | ab2074e8e8f443613ee1c12968ab163972418911 /scripts/automation/trex_control_plane/stl/trex_stl_lib | |
parent | 4607fb5588bbb7dc0a708ffd5f97fe99bee98dd2 (diff) |
master_daemon & other daemons updates
Diffstat (limited to 'scripts/automation/trex_control_plane/stl/trex_stl_lib')
-rwxr-xr-x | scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py | 8 |
1 files changed, 4 insertions, 4 deletions
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 33a7b3af..0f68d4a3 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 @@ -165,7 +165,7 @@ traffic_control_kwargs = { } traffic_stats_kwargs = { - 'mode': 'aggregate', # ( aggregate ) + 'mode': 'aggregate', # ( all | aggregate | streams ) 'port_handle': None, } @@ -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 & (TOS1 - TOS0) and user_args & (TOS0 - TOS1): + if user_args & TOS0.symmetric_difference(TOS1): raise STLError('You have mixed %s and %s TOS parameters' % (TOS0, TOS1)) - if user_args & (TOS2 - TOS0) and user_args & (TOS0 - TOS2): + if user_args & TOS0.symmetric_difference(TOS2): raise STLError('You have mixed %s and %s TOS parameters' % (TOS0, TOS2)) - if user_args & (TOS2 - TOS1) and user_args & (TOS1 - TOS2): + if user_args & TOS1.symmetric_difference(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'] |