diff options
author | Ido Barnea <ibarnea@cisco.com> | 2016-03-07 10:55:59 +0200 |
---|---|---|
committer | Ido Barnea <ibarnea@cisco.com> | 2016-03-07 10:55:59 +0200 |
commit | ca3f7e0f81f782638440353c456382b6e607c71e (patch) | |
tree | 8cd21cd54a2e1d55bae1799cc95315d498f0cddd /scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py | |
parent | d5047a7e044c681fffa436015fd9cd246e4ad1b2 (diff) |
changed rx stats to flow stats everywhere
Diffstat (limited to 'scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py')
-rw-r--r-- | scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py index 5aa544ab..cc42c676 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py @@ -125,11 +125,11 @@ STLStreamDstMAC_ARP =2 # RX stats class class STLRxStats(object): - def __init__ (self, user_id): + def __init__ (self, pg_id): self.fields = {} self.fields['enabled'] = True - self.fields['stream_id'] = user_id + self.fields['stream_id'] = pg_id self.fields['seq_enabled'] = False self.fields['latency_enabled'] = False @@ -150,7 +150,7 @@ class STLStream(object): enabled = True, self_start = True, isg = 0.0, - rx_stats = None, + flow_stats = None, next = None, stream_id = None, action_count = 0, @@ -241,10 +241,10 @@ class STLStream(object): # this is heavy, calculate lazy self.packet_desc = None - if not rx_stats: - self.fields['rx_stats'] = STLRxStats.defaults() + if not flow_stats: + self.fields['flow_stats'] = STLRxStats.defaults() else: - self.fields['rx_stats'] = rx_stats.to_json() + self.fields['flow_stats'] = flow_stats.to_json() def __str__ (self): @@ -391,8 +391,8 @@ class STLStream(object): stream_params_list.append('self_start = %s' % self.fields['self_start']) if default_STLStream.fields['isg'] != self.fields['isg']: stream_params_list.append('isg = %s' % self.fields['isg']) - if default_STLStream.fields['rx_stats'] != self.fields['rx_stats']: - stream_params_list.append('rx_stats = STLRxStats(%s)' % self.fields['rx_stats']['stream_id']) + if default_STLStream.fields['flow_stats'] != self.fields['flow_stats']: + stream_params_list.append('flow_stats = STLRxStats(%s)' % self.fields['flow_stats']['stream_id']) if default_STLStream.next != self.next: stream_params_list.append('next = %s' % STLStream.__add_quotes(self.next)) if default_STLStream.id != self.id: @@ -513,17 +513,17 @@ class YAMLLoader(object): - def __parse_rx_stats (self, rx_stats_obj): + def __parse_flow_stats (self, flow_stats_obj): # no such object - if not rx_stats_obj or rx_stats_obj.get('enabled') == False: + if not flow_stats_obj or flow_stats_obj.get('enabled') == False: return None - user_id = rx_stats_obj.get('stream_id') - if user_id == None: + pg_id = flow_stats_obj.get('stream_id') + if pg_id == None: raise STLError("enabled RX stats section must contain 'stream_id' field") - return STLRxStats(user_id = user_id) + return STLRxStats(pg_id = pg_id) def __parse_stream (self, yaml_object): @@ -541,7 +541,7 @@ class YAMLLoader(object): mode = self.__parse_mode(s_obj.get('mode')) # rx stats - rx_stats = self.__parse_rx_stats(s_obj.get('rx_stats')) + flow_stats = self.__parse_flow_stats(s_obj.get('flow_stats')) defaults = default_STLStream @@ -549,7 +549,7 @@ class YAMLLoader(object): stream = STLStream(name = yaml_object.get('name'), packet = builder, mode = mode, - rx_stats = rx_stats, + flow_stats = flow_stats, enabled = s_obj.get('enabled', defaults.fields['enabled']), self_start = s_obj.get('self_start', defaults.fields['self_start']), isg = s_obj.get('isg', defaults.fields['isg']), @@ -762,4 +762,4 @@ def register(): def __len__ (self): return len(self.streams) -default_STLStream = STLStream()
\ No newline at end of file +default_STLStream = STLStream() |