summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIdo Barnea <ibarnea@cisco.com>2016-03-07 11:21:21 +0200
committerIdo Barnea <ibarnea@cisco.com>2016-03-07 11:21:21 +0200
commitea61eabf9f76ef4dea1ad2a4f0cd5cd8f367bd02 (patch)
tree6be3ea88834870f09ed9fca4b9db991ab359b9fc
parentca3f7e0f81f782638440353c456382b6e607c71e (diff)
changed STLRxStats to STLFlowStats
-rw-r--r--scripts/automation/trex_control_plane/stl/examples/stl_flow_stats.py2
-rw-r--r--scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py8
-rw-r--r--scripts/stl/flow_stats.py5
3 files changed, 7 insertions, 8 deletions
diff --git a/scripts/automation/trex_control_plane/stl/examples/stl_flow_stats.py b/scripts/automation/trex_control_plane/stl/examples/stl_flow_stats.py
index 6fb33b22..3708834e 100644
--- a/scripts/automation/trex_control_plane/stl/examples/stl_flow_stats.py
+++ b/scripts/automation/trex_control_plane/stl/examples/stl_flow_stats.py
@@ -18,7 +18,7 @@ def rx_example (tx_port, rx_port, burst_size):
total_pkts = burst_size
s1 = STLStream(name = 'rx',
packet = pkt,
- flow_stats = STLRxStats(pg_id = 5),
+ flow_stats = STLFlowStats(pg_id = 5),
mode = STLTXSingleBurst(total_pkts = total_pkts, bps_L2 = 250000000))
# connect to server
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 cc42c676..7fc132b1 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
@@ -124,7 +124,7 @@ STLStreamDstMAC_PKT =1
STLStreamDstMAC_ARP =2
# RX stats class
-class STLRxStats(object):
+class STLFlowStats(object):
def __init__ (self, pg_id):
self.fields = {}
@@ -242,7 +242,7 @@ class STLStream(object):
self.packet_desc = None
if not flow_stats:
- self.fields['flow_stats'] = STLRxStats.defaults()
+ self.fields['flow_stats'] = STLFlowStats.defaults()
else:
self.fields['flow_stats'] = flow_stats.to_json()
@@ -392,7 +392,7 @@ class STLStream(object):
if default_STLStream.fields['isg'] != self.fields['isg']:
stream_params_list.append('isg = %s' % self.fields['isg'])
if default_STLStream.fields['flow_stats'] != self.fields['flow_stats']:
- stream_params_list.append('flow_stats = STLRxStats(%s)' % self.fields['flow_stats']['stream_id'])
+ stream_params_list.append('flow_stats = STLFlowStats(%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:
@@ -523,7 +523,7 @@ class YAMLLoader(object):
if pg_id == None:
raise STLError("enabled RX stats section must contain 'stream_id' field")
- return STLRxStats(pg_id = pg_id)
+ return STLFlowStats(pg_id = pg_id)
def __parse_stream (self, yaml_object):
diff --git a/scripts/stl/flow_stats.py b/scripts/stl/flow_stats.py
index 9248c691..05d7a9f7 100644
--- a/scripts/stl/flow_stats.py
+++ b/scripts/stl/flow_stats.py
@@ -6,9 +6,8 @@ class STLS1(object):
def get_streams (self, direction = 0):
return [STLStream(packet = STLPktBuilder(pkt ="stl/yaml/udp_64B_no_crc.pcap"), # path relative to pwd
-# mode = STLTXCont(pps=10),
- mode = STLTXSingleBurst(pps=1000, total_pkts=100000),
- flow_stats = STLRxStats(pg_id = 7))
+ mode = STLTXCont(pps=10),
+ flow_stats = STLFlowStats(pg_id = 7))
]